Commit Graph
2091 Commits
Author SHA1 Message Date
Flugente f5dfddb0fc FixFix: non-merc planted explosives that fire fragments caused crashes. A few functions had to be fixed.
Note: keep in mind that we cannot assume that BULLET's pFirer will be valid. Check wether ubFirerID is NOBODY first.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6776 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 14:14:30 +00:00
Flugente 4541487c3b Fix: Opening up sector map could cause crashes.
Note: I am not really sure at what causes the error here, this is probably due to some recent changes in overheadmap. For the time, this fixes that, though someone with better knowledge should fix the real problem eventually.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6775 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 14:12:04 +00:00
Flugente e1b1712205 Fixed dropdown menu glitches
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6774 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 14:06:50 +00:00
Flugente 27db170b39 Fix: overly long loadscreen hints caused crashes when displayed in log. Maximum loadscreen length is now 190 (was 256).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6773 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 14:05:59 +00:00
Wanne 83be50c97c Merged from revision: 6767
- Moved hard coded "Next page" button text for Alumni site to language files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6768 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-17 07:49:21 +00:00
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 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 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 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 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 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 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
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 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 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 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 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
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 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 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 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
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 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
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
Wanne f8a0a5eb2c 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/trunk/GameSource/ja2_v1.13/Build@6691 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-16 09:13:55 +00:00