7623 Commits
Author SHA1 Message Date
Wanne 5f92048f5a Merged from revision: 6764
Fixes (by Buggler)
- fixed hotkey switch weapons AP cost and empty hand swap
- adjusted colors for militia equipment item shading
- fixed IMP background button states and previous button array list

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-15 13:20:31 +00:00
Wanne 8d5ed89e14 Merged from revision: 6761
- Campaign Stats: Externalized hard coded "and" text to language specific text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6762 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-13 20:30:39 +00:00
Wanne 56056b8841 Merged from revision: 1917
- Added missing updated snitch traits for some mercs. This feature was added in GameDir revision: 1906 (by anv)
Beth
Bud
Buzz
Carp
Ears
Gary
Hurl
Lance
Leon
Weasel

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1919 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-13 16:32:19 +00:00
Wanne 3804ef6650 Merged from revision: 6759
- Updated French texts (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6760 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-13 07:59:56 +00:00
Wanne e51b013da1 Merged from revision: 6756
Bugfix: Fixed old (unsupported map version error) A1 map in French version
- Added the English A1 map, which works fine

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6757 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-12 15:33:59 +00:00
Flugente 59c4dfc8f7 Spotter ini settings were lost in previous commit
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1916 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-10 18:39:21 +00:00
Wanne 06123089bb Bugfixes (by anv)
- Fixed Dimitri's recruitment,
- Fixed proper morale gains/losses

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6748 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-10 16:27:21 +00:00
Wanne 8503fc26c2 Visual tactical improvements (by Sevenfm)
1) Improved cover indicator:
SHOW_COVER_INDICATOR
0 - nothing
1 - show as small square to the right of health bar
2 - show using color of merc's name
3 - same as 1, show only in stealth or when disguised
4 - same as 2, show only in stealth or when disguised

2) Enemy rank (exp. level) icons:
SHOW_ENEMY_RANK_ICON
0 - do not show
1 - show icon
2 - show icon from .sti (not yet implemented)

3) Enemy health bar:
SHOW_ENEMY_HEALTH
0 - do not show
1 - show health as text (default)
2 - show health bar
3 - show health + ap
4 - show health + ap + shock
5 - show health + ap + shock + morale
6 - show health + ap + shock + morale + bp

4) Minor improvements:
Enemy awareness sign now shows up only in stealth/disguised mode.
Turned on Extended Disarm Dialog for turnbased (it was implemented but turned off)

Recommended settings for regular gameplay (from video example above):
INDIVIDUAL_ENEMY_NAMES = FALSE
INDIVIDUAL_ENEMY_RANK = FALSE
SHOW_ENEMY_RANK_ICON = 1
SHOW_ENEMY_HEALTH = 4
SHOW_COVER_INDICATOR = 2
SHOW_ENEMY_ADDITIONAL_INFO = 1
SHOW_ENEMY_WEAPON = TRUE

see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/329674/Re:_Code_Snippets.html#Post329674

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1915 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-10 16:22:25 +00:00
Wanne 7782384be5 Visual tactical improvements (by Sevenfm)
1) Improved cover indicator:
SHOW_COVER_INDICATOR
0 - nothing
1 - show as small square to the right of health bar
2 - show using color of merc's name
3 - same as 1, show only in stealth or when disguised
4 - same as 2, show only in stealth or when disguised

2) Enemy rank (exp. level) icons:
SHOW_ENEMY_RANK_ICON
0 - do not show
1 - show icon
2 - show icon from .sti (not yet implemented)

3) Enemy health bar:
SHOW_ENEMY_HEALTH
0 - do not show
1 - show health as text (default)
2 - show health bar
3 - show health + ap
4 - show health + ap + shock
5 - show health + ap + shock + morale
6 - show health + ap + shock + morale + bp

4) Minor improvements:
Enemy awareness sign now shows up only in stealth/disguised mode.
Turned on Extended Disarm Dialog for turnbased (it was implemented but turned off)

see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/329674/Re:_Code_Snippets.html#Post329674

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6747 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-10 16:21:59 +00:00
Kriplo d0897d912c Brief: //dnl ch82
- Fix glitches in overhead map with cliffs.
Details:
- Overhead map never correctly show maps which contains cliff tiles. Some of glitches was incorrect placement for cliff shadows, not rendering complex multi tiles at edges, draw black line spots mostly close to map edges. All of this glitches also go to radar map during creation.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6744 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-09 20:51:02 +00:00
Kriplo a3a9b29ead Brief: //dnl ch83
- Fix BigMaps cliff-prone problem.
Details:
- Bug which prevent merc to go prone and crawl in big maps with cliffs was reported by Buggler who already find source of problem which lies in DB_STRUCTURE_TILE struct variable sPosRelToBase. This variable contains relative position to base tile which and cannot simply be change to INT32 as data from JSD files are loaded into it. However reason for problem is because sPosRelToBase is not updated for quite bunch of structures when map size is changed so add macro which in real time perform conversion and update sPosRelToBase value.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6740 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-08 21:16:35 +00:00
Flugente 49de642d7d IDs use NOBODY, profiles use NO_PROFILE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-07 21:04:07 +00:00
Flugente b387091a8c IDs use NOBODY, profiles use NO_PROFILE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6735 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-07 20:32:51 +00:00
Flugente 8044ea108d Fix: error message when repairing
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6733 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-06 17:04:09 +00:00
Wanne 626c89e9ce Externalizations (by Buggler)
- option for crepitus to attack a random player-controlled town, not just the originating town
- externalized creatures spreading hardcoded defines to Creatures_Settings.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1913 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-06 15:36:51 +00:00
Wanne c0d49d3f16 Externalizations (by Buggler)
- creature xml to use other insertion directions if per-determined direction is invalid
- swapped East and South Insertion_Code enum to be align with Strategic_Move enum
- option for crepitus to attack a random player-controlled town, not just the originating town
- externalized creatures spreading hardcoded defines to Creatures_Settings.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6732 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-06 15:35:52 +00:00
Wanne 27fb0562ee Alternate new shortcut "ALT + Right Mouse Button" for showing skill (traits) menu in Tactical (by Sevenfm)
- Old also working shortcut: "SHIFT + 4"
- moved menu to cursor position instead of soldier's position
- see (youtube): https://www.youtube.com/watch?v=RS7AKv0rWq0



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6731 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-06 15:30:18 +00:00
Flugente 907a4b6b40 Fix: backgrounds not showing up
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-03 17:17:52 +00:00
Wanne f28b6686aa 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

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_v1.13_data@1912 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-03 17:15:57 +00:00
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