Commit Graph
301 Commits
Author SHA1 Message Date
Flugente 98ff352eb0 - added new dynamic opinion events, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=21961&goto=333259&#msg_333259
- Fix: dynamic opinion events on finishing battle did not occur due to faulty sector coordinates
- Fix: dynamic dialogue boxes were displayed with bad screen coordinates
- Change: dynamic dialogue is also written into tactical log
- Change: in events that require a leader, any merc can be considered leader, not just IMPs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7807 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-03 15:35:52 +00:00
silversurfer 2afa02c913 Requires GameDir >= 2227 because of new icons!
EDB now displays available volume and pocket volume for MOLLE items.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7784 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-16 09:56:29 +00:00
Flugente 6e824810ab - Fix: profile id was used instead of profile's face id
- Fix: squad names were not used correctly

- Change: spotter minimum preparation time lowered to 2 turns (was 3)
- Change: spotter ct bonus has been doubled
- Cahnge: spotter cth bonus now works for rifles and sniper rifles


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7774 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-09 18:19:34 +00:00
Flugente 68869f77b2 If ALLOW_BANDAGING_DURING_TRAVEL is set to TRUE, travelling mercs will bandage themselves if they bleed. This behaviour is off by default.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7772 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-07 15:53:25 +00:00
Flugente 9d8e5a4c3a - New prisoner class: Civilians can be interrogated. Does not work for profile-based charcters.
- Capturing civilians is possible if their faction has <fCanBeCaptured> set to 1.

Requires GameDir >= r2215.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7762 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-28 22:35:30 +00:00
Wanne deba6d7ac0 Merged from revision: 7757
Multiplayer Bugfix: Reverted the "endless interrupt bugfix" for the pure client, because it was not working correctly, and the server could not press ALT + E to give the turn back to the client, if stuck.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7758 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-28 12:54:15 +00:00
Flugente 8bfb14e90a New Trait: SURVIVAL (new minor trait) gets the non-weapon parts of the ranger trait.
Requires GameDir >= r2213.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7756 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-27 23:23:03 +00:00
Flugente c7c085b04f New Feature: Militia Volunteer Pool limits the number of militia we can train. Turned off by default.
GameDir >= r2210 is recommended.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7746 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-22 18:52:41 +00:00
Flugente d4432d95c3 - If ALLOW_MILITIA_STRATEGIC_COMMAND is TRUE and militia can be commanded, oen can order them to retreat from autoresolve
- Final sector in a militia group's path is shown while plotting in the strategic map.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7743 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-20 23:27:22 +00:00
Flugente 07e09f17fe Enemy tanks can now fight in autoresolve. If mercs/militia is attacking a tank and has heavy weapons, they will use these against the tank.
Requires GameDir >= r2205.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-11 21:44:15 +00:00
Flugente c9bcf90966 Expanded feature: Militia Strategic Movement is turned on with ALLOW_MILITIA_STRATEGIC_COMMAND set to TRUE and allows plotting paths for the militia just like for merc squads.
GameDir >= r2204 is recommended.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7727 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-08 22:11:16 +00:00
Wanne c94ac421ae Merged from revision: 7725
- Fixed typos in English AIM Bios and source texts (thx to ATigersClaw)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7726 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-04 19:25:06 +00:00
Wanne fd1ecb2edf Merged from revision: 7716
- Improved message prompt when launching game in fullscreen mode on unsupported screen resolutions instead of just those that's set to larger than primary desktop resolution (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7717 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-01-07 20:05:23 +00:00
Wanne eebb57ed38 Merged from revision: 7678
Editor Fixes (by Buggler):
- '~' (tilde) hotkey to toggle level cursor if applicable; CTRL hotkey for placing objects on roof removed 
- Fixed missing roof cursor for non-vanilla size maps
- Updated editor popup text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-09 15:57:15 +00:00
Wanne bb264d6815 Merged from revision: 7674
- Fixed merc lighted movement popup text in options screen (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7675 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-06 12:57:40 +00:00
Wanne 0ef41fffd7 Merged from revision: 7668
- Externalized hardcoded TownInfo text which shows the number of Total # of prisoners/capacity, to language text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-01 20:57:11 +00:00
Wanne 6e0823d5d1 Merged from revision: 7662
Fixed typos in Source Code texts (thx to ATigersClaw)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-11-24 17:13:16 +00:00
Wanne 7b700ac5c2 Merged from revision: 7657
Fixed missing "," for pHelicopterEtaStrings[] for Dutch, Italian, Polish and Russian Version (thx to Woquit)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-11-17 19:51:08 +00:00
Flugente 94ded57962 New Feature: tracking allows rangers to track past movements.
Fro more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/337545#Post337545

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7646 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-11-04 20:03:18 +00:00
Flugente eee078af6d Merged revision(s) 7632 from branches/ja2_source_official_2014:
Fix: missing strings lead to confusion in finance log

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-11-02 00:19:00 +00:00
Wanne af1f5c5e17 Merged from revision: 7605
Multiplayer: Added additional info text for using the chat by pressing 'y' in the Multiplayer Start screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7606 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-24 06:59:07 +00:00
silversurfer 74845ec5b9 Fix: Having lower (and invalid) team size values in Ja2_Options.ini than in the savegame could lead to crashes. I put back the check and warning message for this case. Having higher numbers in the ini is ok.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7590 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-18 19:54:50 +00:00
Wanne e000abcc57 Merged from revision: 7586
Multiplayer Bugfix:
- Improved (fixed) interrupt endless clock when enemy interrupts (CO-OP game) (tested by Woquit)
- Override turn (ALT + E): Now it is possible again for the server to give the turn back to itself
- Updated MP Version Number to 3.1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-18 14:08:28 +00:00
Flugente fc861e0ba1 - Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER)
- Fix: during dialogue, mercs did not agree often enough
- Fix: if no mercs were in any squad, Melody website did not show relations
- Dialogue has been reordered, this should make adding new ones slightly easier

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-27 20:19:49 +00:00
Flugente 7558c84bc2 New Feature: IMP gear selection allows choosing what items an IMP starts with instead of relying upon randomness.
Requires GameDir >= r2152, as required images were added.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-23 22:46:10 +00:00
Flugente 5a0d93da94 Feature improvement:
- If MILITIA_USE_SECTOR_EQUIPMENT is TRUE and you assign a merc to the 'MOVE ITEM' assignment, you can select wether gear that the militia can use should be ignored.
- To prevent confusion, 'MOVE ITEM' has been renamed 'GETITEM'.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7517 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-14 14:02:16 +00:00
Flugente a642ab500d Covert Ops trait improvements:
- performing suspicious activities renders a spy easily identifiable for a short time (realtime) or until he ha spend enough AP (turnbased). This should make exploiting disguises harder.
- if a spy is closer than COVERT_ELITES_UNCOVER_RADIUS to an elite or officer, they can uncover the spy, depending on uniform worn an experience levels.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-13 13:12:46 +00:00
Flugente 029da88b51 Added missing translations.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7510 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-11 22:39:54 +00:00
Wanne 84089c3c0c Merged from revision: 7500
- Fixed wrong camo type worn off message (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-08 19:32:17 +00:00
Flugente 15083befa2 Feature improvement: Battle reports in campaign history get a proper Operation name
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-01 20:20:13 +00:00
Flugente e00897b91b New Feature: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279
Does not break savegame compatibility.

Requires GameDir revision >= r2130.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-30 17:34:25 +00:00
Wanne 5e8ba14f42 Merged from revision: 7434
Updated Game Option popup text on tweaked hotkeys (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7435 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-27 07:31:39 +00:00
Wanne dd4935efae Merged from revision: 7431
Multiplayer Bugfix: Sector starting edge (N, E, S, W, Center) was wrong initialized

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-26 20:07:03 +00:00
Wanne 73ce03a240 Merged from revision: 7429
Tweaked hotkeys (by Buggler & Sevenfm)
- 'Alt + R' for reloading merc weapon (new)
- 'X' for alternate hotkey for 'P', Prone
- 'Ctrl+Alt+W' for toggling Wireframes (remapped)
- 'W' for alternate hotkey for 'L', Look
- 'Ctrl+Alt+G' for toggling Artificial Merc Light (remapped)
- 'G' for toggling formation movement (remapped)
- 'Ctrl+Alt+I' for toggling Glow Items (remapped)
- 'Ctrl+T' for forced turn mode (remapped)
- 'Ctrl+Alt+Shift+T' for test capture in cheat mode (remapped)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-26 11:14:50 +00:00
Wanne a205b41ba5 Merged from revision: 7397
Externalized History Log texts (by Jazz)
- see TableData\History.xml
- added support for language specific history (German.History.xml, French.History.xml, ...)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-20 04:26:31 +00:00
Flugente 36e9d15edc New feature: Diseaes affect your mercenaries. They can be contracted in varíous ways and have varying effects.
For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334918#Post334918

Requires GameDir >= r2099.

Does not break savegame compatibility.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-10 13:45:11 +00:00
Wanne 8dabe65ba6 Merged from revision: 7372
- Added custom game resolution (by Buggler)
- Minor additions to editor popup text (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7374 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-05 17:03:16 +00:00
Wanne 05fdcb5d2e Merged from revision: 7363
- Map Editor now properly handles all available items without empty placeholders in between (by anv)
- Added item compare popup help text (by Buggler)
- Enemy icons will not be shown as 10x icons in 640x480 due to visibility issues (the rest remains as it is) (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7364 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-26 13:07:32 +00:00
Wanne a79be62f21 Merged from revision: 7359
Fixes (by Buggler)
- new error message when launching game in fullscreen beyond desktop resolution
- fixed cycling previous item hotkey in cheat mode
- refactored main menu button and hotkey code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-22 16:40:02 +00:00
Flugente 0efc3b7241 - When ordering a merc to interrogate, one can now select what type of prisoners should be interrogated primarily. Thus one no longer has to empty the prison just to get to the one remaining officer.
- Generals are now a separate prisoner type. They cannot join militia, but yield an impressive ransom.
- various prisoner fixes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7327 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-10 21:19:26 +00:00
Wanne b856eece9d - Added new texts for feature "dynamic dialogue" to the language specific cpp files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-29 17:07:03 +00:00
Wanne f5e94e869a Merged from revision: 7267
Fixes (by Buggler)
- Allows sector inventory item deletion feature to delete inaccessible and not-in-sector items. Hold 'Delete' hotkey and click the item
- Hot key Ctrl+Tab can now switch to the second page of General tab in EDB for weapons
- Fixed hardcoded mine icons and spawning pool sector in AI Viewer

Editor
- Hotkey for finding previous merc changed to 'Ctrl+Space' to avoid out-of-map boundary display
- Added editor command line options in popup help text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7268 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-05 14:37:32 +00:00
Flugente be52b5bf76 Fix: CTD on MeLoDY website if player has no active mercs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7249 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-31 20:09:52 +00:00
Flugente 5e9289b450 - New Feature: dynamic opinions allows mercs to form opinions about each other depening on actions they/the player take or do not take. These can be viewed in the 'MeLoDY 'website. See also http://www.bears-pit.com/board/ubbthreads.php/topics/333259.html#Post333259
- Requires GameDir r2050.
- new background property: <dislikebackground> allows mercs to dislike specific backgrounds
- Fix: snitches did not correctly prevent misbehaviour
- Fix: morale event was not handled
- Fix: DropDowns did not refresh when using the arrow buttons

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7240 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-28 22:10:42 +00:00
Wanne 262b1ea128 Merged from revision: 7230
Fixes (by Buggler)
- Added first page and last page buttons to history log
- Fixed pick up backpack on the same grid to cost the same as manually picking it up instead of no cost
- Display message when dropping and picking backpacks for all mercs in sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7231 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-23 19:07:05 +00:00
Wanne bbff053fc5 Driveable vehicle Update: Externalized vehicle seats (by anv)
- externalised vehicle seats (TableData\Vehicles.xml) influence position of passenger, field of view, ability to shoot and being hidden,
- seat can chosen by using ctrl+RMB on vehicle (ctrl + LMB just takes the first visible seat)
- seats can be changed or swapped while inside vehicle,
- remade JSD files for cars,
- vehicles aren't transparent anymore,
- vehicles are louder than people, depending how fast they move.
see: http://www.bears-pit.com/board/ubbthreads.php/topics/332790/5.html


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-18 15:26:15 +00:00
Flugente cf1b9982ba Merged revision(s) 7209 from branches/ja2_source_official_2014:
- improved prisoner handling code

- Fix: imprisoned officers were wrongly converted into elites


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-18 14:40:58 +00:00
Flugente b571d62a8b Number and type of prisoners in player-controlled prisons is now displayed in sector info box.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-02 23:06:54 +00:00
Flugente ba59e9fa5e skill menu entries can be translated
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7180 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-01 20:16:19 +00:00
Flugente 6edf7dd079 - New Feature: Enemy Generals are unique enemies whose location randomized and unknwon to the player. As long as they are alive, the enemy gets signifiant strategic boni. The player must learn of their location and take take them out, preferrably without alerting them prior.
- Covert Ops: Bleeding is deemed suspicious only if COVERT_DETECTEDIFBLEEDING is set to TRUE.
- renamed special prisoners to officers. 
- lowered the priority of enemy troops becoming medics
- prisoners in player-controlled prisons now use the prioner-colour scheme used by Shank and Dynamo


Requires GameDir >= r2028.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-01 13:28:33 +00:00