7604 Commits
Author SHA1 Message Date
Wanne 3fc109b02d Improved health bar in tactical (by Sevenfm)
Option SHOW_HEALTHBARSOVERHEAD is now integer:
0 - no bar
1 - default health bar
2 - small version of new bar
3 - large version of new bar
4 - small health bar + AP indicator
5 - large health bar + AP indicator

New health bar offers you:
- Suppression shock indicator (shock affects your CTH)
- Optional larger version (useful for hires playing)
- Cover indicator that will tell you if your cover is not perfect
- Target movement tile cover indicator (hold SHIFT)
- Sneaking indicator (sneaking is shown by brown border color)
- AP indicator (red if AP<10, dark grey if AP<MIN_APS_TO_INTERRUPT )

Note: cover indicators are enabled only in turnbased combat or when sneaking

see: http://www.bears-pit.com/board/ubbthreads.php/topics/172712/17.html


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6727 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-03 17:14:35 +00:00
Wanne daa0a32335 - Fixed variable typo for creature xml code (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6726 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-02 10:07:08 +00:00
Wanne 2ea80d5ec4 Bugfix: Fixed crash when closing laptop and playing with vanilla settings ("Data" folder)
- The Game looked for files (Helicopter feature repair, GameDir rev. 1897) in the "Data" folder, but those files were only in the "Data-1.13" folder
- I moved the files in the "Data" folder


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1911 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-02 09:53:25 +00:00
Wanne 0f402562b9 - Added CampaignStatsEvents.xml for "Data" folder, so the game can start with the Vanilla ja2.ini settings
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1910 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-02 08:14:47 +00:00
Wanne e236f90db6 Creature Externalization (by Buggler)
- externalized creature feeding sector CREPITUS_FEEDING_SECTOR to Mod_Settings.xml
- added more comments to CreaturePlacements.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1909 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-02 07:43:00 +00:00
Wanne ac83a9600d - Externalized creature feeding sector CREPITUS_FEEDING_SECTOR (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-02 07:42:24 +00:00
Flugente fd72b7fbee Radio set battery can now be bought from BR.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1908 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-01 14:17:46 +00:00
Wanne 3a3665895b Creatures Externalizations (by Buggler)
- externalized creatures placement and composition to CreaturePlacements.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1907 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-01 12:52:31 +00:00
Wanne e3752a00fc Creatures Externalizations (by Buggler)
- externalized creatures placement and composition to CreaturePlacements.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6724 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-01 12:41:16 +00:00
Wanne 0f8b6d9408 New Trait "Snitch" (by anv)
- Every midnight snitches will give you a report about their collegues' opinions
- All values configurable in Skills_Settings.ini, section [Snitch].
- Externalised Morale and Reputation Settings
  Morale_Settings.INI, Reputation_Settings.INI
  All values of events moved from code to Morale_Settings.ini and Reputation_Settings.ini.

Currently list of snitches (trait 22)
Beth (Data)
Bud (Data-1.13)
Buzz (Data-1.13)
Carp (Data-1.13)
Ears (Data-1.13)
Gary (Data-1.13)
Hurl (Data-1.13)
Lance (Data-1.13)
Leon (Data-1.13)
Weasel (Data-1.13)

- Separate traits limits for IMP and predefined mercs.
MAX_NUMBER_OF_TRAITS = 10
NUMBER_OF_MAJOR_TRAITS_ALLOWED = 5

MAX_NUMBER_OF_TRAITS_FOR_IMP = 3
NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP = 2

see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/Snitches_+_Externalised_morale.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1906 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-01 12:34:18 +00:00
Wanne d5b4599e9c New Trait: Snitch (Trait 22) (by anv)
Every midnight snitches will give you a report about their collegues' opinions. Information includes:
- merc whining about high death rate,
- merc whining about player reputation,
- merc whining about his low morale,
- merc whining about some other merc (unliked, not only hated),
- merc planning to quit (leave without renewing contract, only AIM mercs) next day,
- merc whining about player inactivity,
- merc whining about player owing them money (you can only owe money to MERC mercs).

List of snitches (trait 22)
Beth
Bud
Buzz
Carp
Ears
Gary
Hurl
Lance
Leon
Weasel

see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/Snitches_+_Externalised_morale.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6723 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-01 12:02:23 +00:00
Wanne c9cdc92121 Visual info feature (by Sevenfm)
New option SHOW_ENEMY_ADDITIONAL_INFO in ja2_options.ini
0 - nothing
1 - show awareness sign above enemy soldier (useful for sneaking and covert operations)
Eye sign means that enemy sees you.
Color shows enemy alert level (green, yellow, orange, red)
2 - show if enemy wears gas mask or nvg
3 - show if enemy has any armour (helmet, vest, leggings)
Note: additional info is shown only at limited range (based on current vision distance and merc's experience), similar to dynamic tooltips.
see: http://www.bears-pit.com/board/ubbthreads.php/topics/172712/17/Code_Snippets.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1905 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-30 17:34:53 +00:00
Wanne 224ebe9ba3 Visual info feature (by Sevenfm)
New option SHOW_ENEMY_ADDITIONAL_INFO in ja2_options.ini
0 - nothing
1 - show awareness sign above enemy soldier (useful for sneaking and covert operations)
Eye sign means that enemy sees you.
Color shows enemy alert level (green, yellow, orange, red)
2 - show if enemy wears gas mask or nvg
3 - show if enemy has any armour (helmet, vest, leggings)
Note: additional info is shown only at limited range (based on current vision distance and merc's experience), similar to dynamic tooltips.
see: http://www.bears-pit.com/board/ubbthreads.php/topics/172712/17/Code_Snippets.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6722 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-30 17:34:25 +00:00
Wanne 536913fd44 - Added missing "Show Merc Ranks" option for French version (thx to hrvg)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6721 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-29 20:32:15 +00:00
Wanne 95332d38a5 - Bugfix: Fixed VICTORY music not played after battle is won
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6720 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-28 19:54:05 +00:00
Wanne 44cf72a2e0 - Fixed compilation error for JA2UB define (by anv)
- Added missing string to _FrenchText.cpp
- Renamed the "#if (defined JA2UB)" to "#ifdef JA2UB" so we are consistent through the code


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-28 18:27:09 +00:00
Wanne 5aab654ee6 - Bugfix: Fixed email subject for Gaston on salary increase
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1903 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-27 09:42:03 +00:00
Wanne 5bf82b9d82 Heli Refuel Updates (by Buggler)
- heli refuel site marking in airspace mode
- fixed missing remaining fuel & distance to fuel site text in other languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6715 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 09:37:32 +00:00
Wanne 7b92c317ea Hide heli refuel site in airspace mode before discovering them (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1902 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-27 09:36:07 +00:00
Wanne 0ec3c152f9 - Translated a few texts in German
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6714 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 09:22:56 +00:00
Wanne 8de274df73 - Minor correction in text files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 09:22:32 +00:00
Wanne f6e2c3aed8 - Bugfix: Playing in high screen resolution (> 1024x768) and reaching the tactical placement screen UI, the loadscreen image was still visible in the lower left and right part of the tactical placement screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 09:21:53 +00:00
Wanne 02bdbf2ed7 - Bugfix: SaveLoad-Dialog does not automatically jump to the correct page, when trying to load the last savegame (by Sionus)
o Before patch: openned first page, none saved game slot selected.
o Now: openned page with last save game, slot with last saved game selected.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 08:05:51 +00:00
Flugente aa5a28ac33 Fix: invalid text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6710 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-25 15:09:58 +00:00
Flugente 24d76b6b06 Fix: battle reports were wrongly copied
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-24 22:10:29 +00:00
Flugente 603b1422d4 Fix: multiplayer starting coordinates were wrong
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6708 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-23 13:46:39 +00:00
Wanne 6668b31bd4 Mutliplayer: Disabled the "client interrupt fix", because it does not work (once AI stuck, you cant give the turn by pressing ALT + E on the server back to the client ...)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-23 10:26:01 +00:00
Wanne 644ca237a4 Updated VS 2013 project files
- Added links to new Campaign Stats files (H, CPP)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6706 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-23 09:34:18 +00:00
Flugente f4dcc15ffa New Feature: Campaign History collects combat data and displays battle reports on the website.
requires GameDir >= r1901.

For more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/329205.html#Post329205

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 23:22:45 +00:00
Flugente 0ff363a309 New Feature: Campaign History collects combt data and displays battle reports on the website
For more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/329205.html#Post329205

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1901 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-22 23:19:49 +00:00
inshy b3df6f55b5 Small fixes by hrvvillers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6704 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 17:27:42 +00:00
Flugente e9a4ef52dd Fix: wrong language define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 14:42:45 +00:00
Wanne 405353db5a - Updated French GameDir files (by hrvg)
- Added 3 new items to *.Items.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 11:52:28 +00:00
Wanne 5485610411 - Updated French Translations (by hrvg)
- Renamed any forms of the // TODO.Translate comments spelling to "// TODO.Translate", so we can find them easily

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 11:48:24 +00:00
Wanne 01652ce342 Externalization (by Buggler)
- Externalized HELICOPTER_TOWN_LOYALTY_CHECK in Helicopter_Settings.INI
- Added more comments to CREATURE_MEANWHILE_CUTSCENE in Mod_Settings.ini 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1900 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-22 02:59:25 +00:00
Wanne 0ae8ce2408 Code Cleanup (by Buggler)
- Unused vanilla code cleanup on zoomed strategic map & raising/lowering level

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6700 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 02:58:17 +00:00
Flugente 3e11cb58c4 Fix: missed target caused display of uninitialized text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-21 13:22:49 +00:00
Flugente e7a6adc1aa swapped vision boni of low-quality and high-quality binoculars
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1899 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-20 23:54:01 +00:00
Flugente cbc661d1af Spotter skill effectivity is now affected by sniper or spotter having 'sociable' or 'loner' character
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6698 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-20 18:54:10 +00:00
Wanne 6e7181cf7e - Helicopter Feature (Repair, Fuel, ...)
see: http://www.bears-pit.com/board/ubbthreads.php/ubb/showflat/Number/329091/gonew/1/Helicopter_repair_and_refuel.html

- Spotters for snipers feature
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329093/New_feature:_Spotter.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1898 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-20 10:30:25 +00:00
Flugente fedbbf5df2 Fix: missing popup texts
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6696 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-19 22:36:09 +00:00
Flugente faba9ea713 Helicopter features (by anv):
- Waldo can now repair the helicopter for money
- alternative fuel system
- damage to helicopter can damage passengers

Appropriate Data in GameDir r1897.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-19 22:01:44 +00:00
Flugente 5e89f4e366 Helicopter features (by anv):
- Waldo can now repair the helicopter for money
- alternative fuel system
- damage to helicopter can damage passengers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1897 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-19 22:00:52 +00:00
Flugente 80c1b65494 - New Feature: Spotter skill (available to every merc) allows a merc to be spotter for other snipers. Spotter items have to be in hands, spending APs cancels action.
- renamed GetObjectNCTHModifier to GetObjectModifier, as function is no longer used exclusively for NCTH

Warning: GameDir >= r1896 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-19 20:03:48 +00:00
Flugente 74e0be1cce New Feature: Spotter skill (available to every merc) allows a merc to be spotter for other snipers. Spotter items have to be in hands, spending APs cancels action.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1896 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-19 19:54:34 +00:00
Wanne 85ea4716a8 Improved Auto Fast Forward (by Sevenfm)
- New options in ja2_options.ini

AUTO_FAST_FORWARD_ENEMIES:
0 - default behavior
1 - auto fast forward only enemies that are not seen by player's team
2 - auto fast forward only invisible enemies
3 - auto fast forward all enemies

AUTO_FAST_FORWARD_MILITIA:
0 - default behavior
1 - auto fast forward only militia that does not see enemies
2 - auto fast forward militia always

Note: only movement is accelerated, most of specific actions like shooting and tossing grenades are performed at normal speed

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1895 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-18 13:50:50 +00:00
Wanne eff779a966 Improved Auto Fast Forward (by Sevenfm)
- New options in ja2_options.ini

AUTO_FAST_FORWARD_ENEMIES:
0 - default behavior
1 - auto fast forward only enemies that are not seen by player's team
2 - auto fast forward only invisible enemies
3 - auto fast forward all enemies

AUTO_FAST_FORWARD_MILITIA:
0 - default behavior
1 - auto fast forward only militia that does not see enemies
2 - auto fast forward militia always

Note: only movement is accelerated, most of specific actions like shooting and tossing grenades are performed at normal speed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6693 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-18 13:50:38 +00:00
Flugente a7522989ab deleted unnecessary code duplication: several NCTH-related functions have been unified an now take scope modes into account
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-17 20:18:44 +00:00
Flugente 59e6c62db4 Corrected radio set description.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1894 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-17 18:23:00 +00:00
Wanne 6c85178ef6 New options in ja2_options.ini (by Sevenfm)
1) PLAYER_HIT_COUNT = 0
This works as ENEMY_HIT_COUNT option, but for player mercs.
Possible values: 0 - 4

2) SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION_INFO = TRUE
Show additional info in tactical tooltip:
- APs lost due to suppression
- Suppression Tolerance
- Effective Shock Level ( Shock level modified by traits and backgrounds. This value is compared with current suppression tolerance to determine "cowering" effect )
- AI morale level

3) SHOW_ENEMY_WEAPON = TRUE
Show enemy weapon name above soldier - after health, name and rank.
You can see exact weapon name only on short distances, range calculation is similar to dynamic tooltips and based on soldiers actual viewing range and experience.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1893 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-16 09:22:48 +00:00