Commit Graph
553 Commits
Author SHA1 Message Date
Flugente fddb72a94e Merged revision(s) 7057 from branches/ja2_source_official_2014:
- increased background-based chance to steal to 50%, money/gold/solver will be preferred targets
- lowered exp stat gain for handling tripwire
- new background ability: disarm_trap alters effectivity at defusing bombs
- Fix: incorrectly deleted soldiers could still be counted as jamming/scanning

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-12 22:29:56 +00:00
Wanne fefbbc8e88 Merged from revision: 7042
Translated missing French Texts (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-10 07:33:13 +00:00
Flugente 12d45fcfa2 Merged revision(s) 7024 from branches/ja2_source_official_2014:
- If a merc repairs up to a threshold below 100, display a slightly different message
- Due to radio operator jamming, AI red alert can fail (intentional part of the trait). In that case, forbid the soldier from using radio again this turn, as this would be a fruitless waste of APs.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7025 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-04 22:20:32 +00:00
Wanne f03bc8ef23 Merged from revision: 7022
- Added tooltip info for for turning on/off merc light movement (|G) 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7023 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-04 17:27:15 +00:00
Wanne db9ecb102d Merged from revision: 7002
Editor Enhancement (by Buggler)
- Hold shift to select previous merc instead of next merc when using hotkeys or associated buttons

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7003 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 09:54:55 +00:00
Wanne d2130494da New Feature: Additional Tile Properties (by anv)
- Feature can be completely disabled in .ini as COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES under Tactical Cover System Settings.

- With Additional Tile Properties it's possible to supply all tiles with additional data, just like with .jsd files, except in XML.
Files need to have same name as tile's .sti and .jsd files, and be put in \tilesets\AdditionalProperties\, or in specific \tilesets\xx\.

- With additional properties it's possible to specify which camo type, and how effectively will work on any tile. Only snow camo will work on snow covered roofs, red carpet in palace won't perfectly cooperate with urban camo anymore, thick grass in the middle of the forest will provide better camouflage than sparse grass near the road.

- It's now possible to specify footstep volume and stealth difficulty modifier of any tile. Carpets will absorb noise, tile floors amplify it, twigs laying on the tile will make sneaking harder. Choose your path carefully, taffer. 

- More infos: http://www.bears-pit.com/board/ubbthreads.php/topics/330942.html#Post330942


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7001 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-01 09:50:40 +00:00
Flugente 3ae95a6c20 Merged revision(s) 6997-6998 from branches/ja2_source_official_2014:
- Campaign stats take spy actions and SAM sabotages into account
- spy encounters are not reproted if nothing of interest happened
- Fix: error in food system automatic canteen refill
- Fix: if min enemy group size is too high, the AI never replensishes garrisons, thereby severely dumbing down the game.
- Fix: enemy groups do not receive minimum size
- Fix: enemy groups sizes are cut down needlessly


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-01 01:48:43 +00:00
Wanne 402933fa52 Merged from revision: 6993
- Bugfix: Changed font for sector loadscreens from FONT12ARIAL to FONT14ARIAL to support more characters (e.g: ')

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6994 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-27 22:22:30 +00:00
Flugente 9e393cd5e3 Merged revision(s) 6985 from branches/ja2_source_official_2014:
- Fix: battle reports no longer report that a team came from north if it was already in sector.
- Fix: red lines at wrong locations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6986 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-26 20:59:25 +00:00
Flugente 916bf88b9d Merged revision(s) 6965 from branches/ja2_source_official_2014:
- [CTRL] + [i] in tactical calls a dialogue for sector inventory manipulations (by Sevenfm)
- [CTRL] + [c] in tactical calls a dialogue for cover/trap display modes (by Sevenfm)
- changed min value for SCOPE_RANGE_MULTIPLIER from 0.5 to 0.1 (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6966 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-22 19:32:13 +00:00
Flugente d888067d81 Merged revision(s) 6957 from branches/ja2_source_official_2014:
reverted length of loadscreenhints back to 190. 

Longer texts cause crashes when a hint is displayed in a log, as VIDEO_OVERLAY_DESC can only handle up to length 200, just like the description in LOADSCREENHINT_STRUCT says.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6958 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-21 18:21:20 +00:00
Wanne 7f2ec17f9b Merged from revision: 6953
- Increased text limit for load screen hints from 190 to 254
o Hopefully this does not cause any problems when rendering on the loadscreens. Tests resulted in success
- Support for localization of LoadScreenHints.xml (*.LoadScreenHints.xml)
o Now the language specific xmls only have the <uiIndex> and <szName> attributes. All other attributes are in the LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6954 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-21 09:02:17 +00:00
Flugente 4a3ac749e9 Print out warning if militia moe is aborted due to no merc on COMMAND assignment
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6944 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-19 21:03:54 +00:00
Flugente cee17f5651 New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.
requires GameDir >= r1946

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6943 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-18 21:26:46 +00:00
Wanne b690da2bf0 Merged from revision: 6926
- Translated Chinese source code files (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-14 07:42:08 +00:00
Wanne e6ae03cee3 Merged from revision: 6912
- Allow reading of language specific *.MercStartingGear.xml Kit names
- Fixed *.Pockets.xml not working
- Reworked a few German texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 12:57:01 +00:00
Wanne 11037729f0 Merged from revision: 6905
Improved Snitch Trait (by anv)
- The snitch actions can be selected in the strategy view "Assignment" menu
o Spreading Propaganda: Accessible in town sectors
o Gathering Rumours: Accessible in town sectors
o Undercover Prison Snitch: Accessible from Facilities menu (Prison)
o Preventing Misbehaviour: New Snitch Menu
o Passive Reputation Increase
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/1.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 17:22:40 +00:00
Wanne 3c95f4c9c2 Merged from revision: 6900
- Translated missing Chinese texts (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 11:53:13 +00:00
Wanne 06a832a7ab Merged from revision: 6898
- Fixed wrong/missing texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 11:45:29 +00:00
Flugente cb3304e93f Merged revision(s) 6894 from branches/ja2_source_official_2014:
Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-10 00:28:04 +00:00
Wanne a9008cf53d Merged from revision: 6850
- Translated text to French (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6851 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-29 20:42:32 +00:00
Wanne 64efff67fa Merged from revision: 6846 and 6847
- Fixed missing text entry in _FrenchText.cpp
- Bugfix: Fixed initialization not working for foreign language *.EnemyTaunts.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6848 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-29 20:32:04 +00:00
Wanne 72c4a77598 Merged from revision: 6844
- Fixed French texts (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6845 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-29 09:35:38 +00:00
Wanne d4aa35a66e Merged from revision: 6824
Map Editor Fixes/Improvements (by Buggler)
- Better UI feedback after last item deleted from item stack in editor item mode
- Improved editor room number increment code. 'Shift + LMB' when drawing room numbers will reuse same room number on next input
- externalized hardcoded button tooltip text in editor tile selection window 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-26 08:15:40 +00:00
Wanne e3bc68948e Merged from revision: 6812
Reworked Sectory actions menu (CTRL + .) (by Sevenfm)
- Also added support for 16 medium size buttons dialog.
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/329932.html#Post329932

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6813 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-22 13:28:48 +00:00
Wanne 8cca415daa Merged from revision: 6804
- Updated French text files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6807 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-20 19:41:19 +00:00
Wanne b038ab4f0d Merged from revision: 6786
Added missing text line in French version
- L"Refuel site"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6787 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 18:14:51 +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 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
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
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 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 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
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 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
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
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 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
Wanne 135e576d27 Re-Fixed mercs Files.cpp (by Buggler)
o I assumed it was a Chinese character, but Buggler told me it was Korean. Anyway, we removed it ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6677 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-03 10:29:20 +00:00
Wanne 5c062ff752 Extended "Merc Random Stats Feature" (by Jenilee)
- Added 4th option for MERCS_RANDOM_STATS (MERCS_RANDOM_STATS = 4)
  o full randomization of mercs, including traits, gear kits and all statistics
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/328769.html#Post328769

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6676 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-03 10:14:15 +00:00
Wanne 8c4201e335 - Fixed wrong encoding and damaged content of mercs Files.cpp (by Buggler)
- Moved Chinese Character from mercs Files.cpp to _ChineseText.cpp, so we can have correct encoding of mercs Files.cpp


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6675 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-03 09:24:24 +00:00
Kriplo 9a67e804c6 - fix to ch79, lights was not saved during automatic map conversion from mapeditor with -DOMAPSCNV command switch.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6670 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-30 19:13:41 +00:00
Kriplo 56b2260ff1 79. Brief: //dnl ch79
- Fix random item problems, add automatic maps conversion, fix some exceptions.
Details:
- Random items are now converted to proper real item if added through mapeditor as world or merc item. However random item will be permanently deleted after map is loaded if randomitemcoolnessmodificator not met expected game progress conditions rather then remain as random item.
- Add command line option -DOMAPSCNV to mapeditor which will automatically create radarmaps and convert all maps to the latest map version, all maps will be written to profile MAPS directory so be sure this folder is empty as any existing maps will be overwritten.
- Fix some exceptions for missing GAP files and strange CTD when we pass command line arguments through VS2010.
- Fix not opening items selection from merc inventory if we first do left and then right click for item choosing.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-29 22:49:48 +00:00