7623 Commits
Author SHA1 Message Date
Wanne 68717329fc Fixes (by Buggler)
- Added notification in message log when mercs cannot climb with backpack
- Reorganized hotkeys code in alphabetical order for easy reference
- Moved item transformation hotkey from 'Y' to 'Shift + T' due to hotkey being used to call up chatbox in networked game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-20 12:33:03 +00:00
Wanne ff4b9820dc Moving Tanks Feature (by anv)
- feature: tanks can move around in tactical. Set with Tactical Gameplay Settings > ENEMY_TANKS_CAN_MOVE.
- feature: tanks can ignore chance to get through and destroy enemy cover even if it probably won't hit anyone behind it. Set with Tactical Gameplay Settings > ENEMY_TANKS_BLOW_OBSTACLES_UP.
- feature: tanks can use cannon even against single mercs and in perfect health. Set with Tactical Gameplay Settings > ENEMY_TANKS_DONT_SPARE_SHELLS.
- feature: tanks can noticed as soon as any part of it is visible. Set with Tactical Gameplay Settings > ENEMY_TANKS_ANY_PART_VISIBLE.
- feature: depending on game difficulty enemy patrols at game start can be randomly reinforced with tank. Set with Strategic Gameplay Settings > ARMY_USES_TANKS_IN_PATROLS.
- feature: depending on game difficulty enemy groups created during offensives can include tanks. Set with trategic Gameplay Settings > ARMY_USES_TANKS_IN_ATTACKS.
- feature: mercs in vehicles automatically rest their guns,
- fix: guns can be rested on vehicles,
- rewritten code to allow putting enemies inside vehicles,
- added missing descriptions for all vehicle options to INIEditorJA2Options.xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2055 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-18 18:10:27 +00:00
Wanne 981c81b4b4 Moving Tanks Feature (by anv)
- feature: tanks can move around in tactical. Set with Tactical Gameplay Settings > ENEMY_TANKS_CAN_MOVE.
- feature: tanks can ignore chance to get through and destroy enemy cover even if it probably won't hit anyone behind it. Set with Tactical Gameplay Settings > ENEMY_TANKS_BLOW_OBSTACLES_UP.
- feature: tanks can use cannon even against single mercs and in perfect health. Set with Tactical Gameplay Settings > ENEMY_TANKS_DONT_SPARE_SHELLS.
- feature: tanks can noticed as soon as any part of it is visible. Set with Tactical Gameplay Settings > ENEMY_TANKS_ANY_PART_VISIBLE.
- feature: depending on game difficulty enemy patrols at game start can be randomly reinforced with tank. Set with Strategic Gameplay Settings > ARMY_USES_TANKS_IN_PATROLS.
- feature: depending on game difficulty enemy groups created during offensives can include tanks. Set with trategic Gameplay Settings > ARMY_USES_TANKS_IN_ATTACKS.
- feature: mercs in vehicles automatically rest their guns,
- fix: guns can be rested on vehicles,
- rewritten code to allow putting enemies inside vehicles,
- added missing descriptions for all vehicle options to INIEditorJA2Options.xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7277 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-18 18:10:07 +00:00
silversurfer 33b3707381 Bugfix: UDB display/color coding of handling, armor piercing and their respective comparison feature was wrong. Also enabled display of maximum counter force modifier for other items than guns.
Bugfix: Calculation of maximum counter force modifier was wrong. Stance based bonus was applied to gun and each of its attachments.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7275 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-16 16:47:35 +00:00
silversurfer 0e15435069 Bugfix: Mercs would act independently after taking part in a boxing match (broken in rev 7178). I reactivated the old fix with an additional check for boxing state so loading a savegame during a boxing match will not break the boxing match.
Bugfix: When a squad had the scouting trait,  CAN_DETECT_ENEMY_PRESENSE_IN_SECTORS_AROUND = TRUE and CAN_DETERMINE_ENEMY_NUMBERS_IN_SECTORS_AROUND = FALSE the map always showed enemy teams next to the player squad because of the false positives feature. I disabled this feature completely until a believable mechanism is implemented for a chance based false positive reporting.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-16 10:20:18 +00:00
Flugente 2a799a5870 - New: WidgetBase serves as a base for future widgets.
- Fix: ctd if dropdown contained exactly one entry

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7272 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-10 20:53:56 +00:00
Wanne 17821ea3f8 Merged from revision: 7270
- Fixed previous creature site habitat data not cleared resulting in incorrect creature spawning sectors (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-10 19:41:04 +00:00
Flugente 9242b972c9 Fix: dynamic opinion data was not cleared correctly upon starting a new game
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7269 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-06 00:41:53 +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
Wanne ca03cb86c0 - Fixed compilation error in NON English builds
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7266 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-05 14:22:01 +00:00
Wanne 97db703fe4 Merged from revision: 7264
Feature: save/load tooltip displays time of save file modification, detailed display (with ctrl pressed) also shows save version (thx Buggler for idea) (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7265 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-03 18:45:07 +00:00
Wanne c76520133a Merged from revision: 2051
- Fixed resetting boxes fought (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2052 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-03 18:42:57 +00:00
Wanne 5d5e02f207 Merged from revision: 7262
Fixes (by anv)
- fix: comparison feature would sometimes show comparison with empty sector inventory slots,
- fix: enemy taunts aimed at NOBODY could cause out of range,
- fix: list of boxers fought per day is properly reset when fight club reopens,
- fix: Van Haussen won't offer a fight or accept bets if all boxers are dead (even if our mercs stand on corpses),
- fix: boxing opponents won't try to call reinforcements any more.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7263 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-03 18:42:29 +00:00
Flugente 89deae89b2 Merged revision(s) 7260 from branches/ja2_source_official_2014:
Fix: error in VS2008 project file

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7261 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-03 18:32:48 +00:00
Wanne fa29d9be26 Merged from revision: 7258
- Translated russian source code comments (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7259 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-03 18:13:23 +00:00
Wanne 1e2d803916 Merged from revision: 7256
Deleted TAIWANESE GameDir files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-03 18:03:54 +00:00
Flugente b118cf07b7 Merged revision(s) 7254 from branches/ja2_source_official_2014:
Deleted TAIWANESE language versions.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-02 19:00:06 +00:00
Flugente 8927918913 Fix: skill display crashed and/or was badly aligned when selecting many traits (by cres)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-02 17:21:23 +00:00
Flugente 6448b332ec Merged revision(s) 7251 from branches/ja2_source_official_2014:
code cleanup & removed some warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-01 21:50:14 +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
silversurfer b824267154 - fixed behaviour of the 's' key and 'walk' UI toggle. When you press 's now or click on the 'walk' icon the character(s) stand up (if not already standing) and go to walk mode. Before they could be stuck in running mode which had been activated previously.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7247 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-31 19:46:19 +00:00
Wanne a8b6c482e4 Merged from revision: 7243
- Translated German.Items.xml (by Leonidas)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7246 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-30 20:22:13 +00:00
Wanne 8c822524d0 Merged from revision: 7244
- Improved German translation for _Ja25GermanText.cpp (by Leonidas)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7245 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-30 20:21:19 +00:00
Wanne d88ca480fb - Bugfix: The variable fErrorFlag was not initialized with FALSE, which could result in showing the laptop website error dialog (text content from variable pErrorString[])
- Bugfix: Fixed wrong button and text position in the laptop website error dialog (text content from variable pErrorString[])

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-30 12:04:21 +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
Flugente a57a1d5d27 - 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
- new background property: <dislikebackground> allows mercs to dislike specific backgrounds

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2050 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-28 22:03:13 +00:00
Wanne 6ea1d5dd8d Merged from revision: 7238
- Translated texts from _ChineseText.cpp (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-27 18:14:20 +00:00
Wanne d58cf279d4 Merged from revision: 7236
- Translated missing texts in Chinese.Backgrounds.xml (by Jason Lejardo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7237 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-26 19:05:47 +00:00
silversurfer bde20308cd - changed SHOT_HEAD_DIVISOR to SHOT_HEAD_MULTIPLIER. The old name was misleading
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2048 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-26 16:49:09 +00:00
silversurfer 40e3e24a20 - changed SHOT_HEAD_DIVISOR to SHOT_HEAD_MULTIPLIER. The old name was misleading
- fixed CTH bonus calculation for special characters in NCTH
- fixed merc swap feature. Sometimes mercs became invisible because of wrong structure problems.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7235 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-26 16:47:48 +00:00
Wanne e7644240ef Merged from revision: 7232
- Translated Chinese.Backgrounds.xml and Chinese.LoadScreenHints.xml (by Jason Lejardo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7233 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-25 18:00:51 +00:00
Wanne 3f16ec0cff Merged from revision: 2046
- Added first page and last page buttons to history log (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2047 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-23 19:07:52 +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 b5aa779b1b Merged from revision: 7228
Fix: tank cannon and other internal items of IC_GUN class with unspecified gun type (NOT_GUN)
- It would by default use 0.0 for damage/range/handling/etc. modifiers, essentially making them useless (and leading to tanks never using their cannons). Now all modifiers for NOT_GUN are 1.0 by default and can be specified in Item_Settings.ini like any other type. (by anv & Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-23 06:39:37 +00:00
Wanne d8fcb599d8 Merged from revision: 2044
- Reworked/improved english texts for LoadScreenHints.xml and CampaignStatsEvents.xml (by John A Smith)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2045 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-22 18:48:55 +00:00
Wanne cd7a8d2d7a Merged from revision: 7226
- Fixed typos and reworked texts in *.LoadSceenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7227 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-20 19:01:23 +00:00
Wanne 028d942421 Merged from revision: 2042
- Fixed typo in LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2043 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-20 19:00:04 +00:00
Wanne 34978fc15e Merged from revision: 7224
- Fix: removing dead mercs who were inside vehicle at the moment of death would cause assertion failure. (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-20 18:33:55 +00:00
Flugente 8abbd3c053 Fix: boxer never got out of boxing ring, leading to an endless clock
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7222 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-19 21:14:58 +00:00
Flugente d0abe79327 New: if KNOWN_NPCS_DIFFERENT_MAPCOLOUR is TRUE, friendly NPCs known to the player are displayed in dark blue to easier differentiate them from normal civilians
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2040 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-19 20:48:22 +00:00
Flugente 038b559c3e - New: if KNOWN_NPCS_DIFFERENT_MAPCOLOUR is TRUE, friendly NPCs known to the player are displayed in dark blue to easier differentiate them from normal civilians
- cleaned up DrawSelectedUIAboveGuy()
- Fix: missing header
- when jumping through windows, damage received is somewhat randomized

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-19 20:47:42 +00:00
Wanne 0fcbed45b3 Merged from revision: 7219
Fixes (anv & Buggler)
- fix: backpacks stacked in the same sector inventory slot would share ownership, causing soldier to pick-up both of them, now when stacking ownership is automatically disabled,
- fix: when manually reorganizing backpacks in inventory slots, ownerships are properly swapped too,
- fix: when using auto pick-up backpack feature function was looping through non-existing items in sector inventory, possibly creating duplicates,
- fix: "drop all backpacks" feature was limited to 18 mercs, now it works for all player-controlled characters.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-19 19:00:14 +00:00
Wanne f05dfc0b1e Merged from revision: 7217
Bugfixes (by anv)
- fix: ambient sounds weren't played after loading game in tactical,
- fix: AI with a lot of APs would stop moving around during combat.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-19 18:51:43 +00:00
Wanne 6f253e7e49 Driveable vehicle update (by anv)
- Vehicles can now exit sector in tactical screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-19 18:49:20 +00:00
Flugente 0fd5f010b8 increased possible number of helicopter refuel sites from 2 to 30
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7214 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-18 16:05:12 +00:00
Wanne 616b48acb9 - Improved NCTH cursor (by Sevenfm)
ja2_options.ini: IMPROVED_NCTH_CURSOR

0 - default cursor
1 - improved cursor: show extended AP info, laser dot, scope mode icon, limit maximum displayed aperture size (100)
2 - compact cursor:  aiming level as numbers, limit displayed autofire bullets (10), limit maximum displayed aperture size (50)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2039 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-18 15:44:02 +00:00
Wanne 666a9fdf22 - Improved NCTH cursor (by Sevenfm)
ja2_options.ini: IMPROVED_NCTH_CURSOR

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7213 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-18 15:42:56 +00:00
Wanne 4476e2bf14 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_v1.13_data@2038 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-18 15:27:09 +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
Wanne c650ba6eac Merged from revision: 2036
- Eldorado, hummer, jeep animation cleanup (by rummtata)
- Minor language touchups for CampaignStatsEvents.xml, LoadScreenHints.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2037 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-18 14:44:04 +00:00