7604 Commits
Author SHA1 Message Date
Wanne 402de5cf3a - Added comment to CampaignStatsEvents.xml
- Removed empty tags (which are not needed) from CampaignStatsEvents.xml 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1998 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-24 09:49:33 +00:00
Wanne 873b9908dc Merged from revision: 7110
- Bugfix: Language version of *.CampaignStatsEvents.xml not working correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7111 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-24 09:48:49 +00:00
Wanne b5fe46fe0c Merged from revision: 7108
- Fixed again wrong structure in *.Backgrounds.xml
- Translated French.Backgrounds.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7109 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-24 08:44:49 +00:00
Wanne b892f20a1e Merged from revision: 7106
- Fixed missing line breaks in *.Backgrounds.xml files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7107 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-23 16:15:12 +00:00
silversurfer 0516abde05 fixed infinite loop (by JosephCKohn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7104 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-21 09:15:51 +00:00
Wanne c8b35b604c Merged from revision: 7101
- Added missing entries to Data-1.13/TableData/*.Backgrounds.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-20 18:03:07 +00:00
Wanne 768e7a7049 Merged from revision: 1996
Minor fixes/improvements for existing features (by Sevenfm)
- Removed some unnecessary options for SHOW_HEALTHBARSOVERHEAD, SHOW_COVER_INDICATOR.
- New option: ENEMY_CLOCK_SPEED_PERCENT - set clock speed during enemy turns.
With this option, player can set default speed to comfortable value (100-120) and set increased speed for enemy turns (150-200).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1997 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-20 09:19:16 +00:00
Wanne 9734b094fc Merged from revision: 7099
Minor fixes/improvements for existing features (by Sevenfm)
1) Slightly reduced the size of merc's healthbar to fit general ja visual style.
2) Removed some unnecessary options for SHOW_HEALTHBARSOVERHEAD, SHOW_COVER_INDICATOR.
3) Several minor fixes.
4) New option: ENEMY_CLOCK_SPEED_PERCENT - set clock speed during enemy turns.
With this option, player can set default speed to comfortable value (100-120) and set increased speed for enemy turns (150-200).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7100 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-20 09:17:39 +00:00
silversurfer 51f2eaff78 fix for CTD when the prebattle interface should come up but we are in tactical screen at the moment. The game tried to draw into an invalid screen.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7096 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-19 17:22:31 +00:00
silversurfer 76511902e0 fix for aim bonus attribute display in UDB
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/331382/Re:_AIMNAS_Bug_reports.html#Post331382


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-19 15:52:15 +00:00
Wanne bc8ec35314 Merged from revision: 7092
Fixes (by Buggler)
- Fixed possible assertion moving a single-merc squad to another sector when using 'Selected Merc' option in Exit Dialog box by disabling the option for the described scenario
- Added page numbers to option and saveload screen (saveload screen page number are not properly refreshed though)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-19 11:50:06 +00:00
Flugente c9b0c6fc12 Merged revision(s) 7088 from branches/ja2_source_official_2014:
Radio operator improvements:
- if RADIO_OPERATOR_JAMMING_BLOCKSRADIOBOMBS is TRUE, radio operator jamming will prevent remote activation or defusing of bombs. Quest-related remotes are still active.
- if RADIO_OPERATOR_ENEMY_JAMMINGSETSOFFRADIOBOMBS is TRUE, there is a small chance that jamming enemy radio operators will set of remote bombs/defuses
- removing a radio set from inventory ends scanning/jamming

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7089 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-18 22:20:56 +00:00
Flugente d4c23fec00 Merged revision(s) 1993 from branches/ja2_data_official_2014:
Radio operator improvements:
- if RADIO_OPERATOR_JAMMING_BLOCKSRADIOBOMBS is TRUE, radio operator jamming will prevent remote activation or defusing of bombs. Quest-related remotes are still active.
- if RADIO_OPERATOR_ENEMY_JAMMINGSETSOFFRADIOBOMBS is TRUE, there is a small chance that jamming enemy radio operators will set of remote bombs/defuses


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1994 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-18 22:18:54 +00:00
Flugente 85b582ed89 Merged revision(s) 7086 from branches/ja2_source_official_2014:
Fix: using hip-firing mode resulted in no item values used from either the gun or most attachments

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7087 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-18 21:08:17 +00:00
silversurfer c45b5aa7f6 Fix for aim level calculations. Base weapon modifiers are now always applied except for shooting from hip. This fixes the problem that an optical attachment could remove base weapon modifiers completely and apply a bonus on top of that.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7084 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-18 08:19:41 +00:00
Flugente 1a47da6d4e Merged revision(s) 7082 from branches/ja2_source_official_2014:
Fix: huge amounts of memory are allocated for AStar pathing but are never used. This also causes a significant slowdown every time a turn ends

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-18 00:06:03 +00:00
Flugente e1b581e466 Enemy roles improvement:
- lowered ENEMYROLES_TURNSTOUNCOVER
- increased ENEMY_MEDICS_SEARCHRADIUS
- new option: ENEMY_MEDICS_WOUND_MINAMOUNT controls how serious a wound must be before a medic considers it worthy of attention
- new option: ENEMY_MEDICS_HEAL_SELF: medics can heal themselves
- new option: ENEMY_OFFICERS_SURRENDERSTRENGTHBONUS adds a team surrender strength bonus for officers
- tanks cannot become medics, and can't be treated by them either
- Menubutton for Role symbol toggle is red if off and green if on
- wounded soldiers seek medics, max range is ENEMY_MEDICS_SEARCHRADIUS / 2
- direct sight line between medic and target is no longer required

- if hostile civilians allied to the army are in sector, their surrender strength is added to the enemy team

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7080 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-17 21:27:19 +00:00
Flugente 18cb4763f6 Enemy roles improvement:
- lowered ENEMYROLES_TURNSTOUNCOVER
- increased ENEMY_MEDICS_SEARCHRADIUS
- new option: ENEMY_MEDICS_WOUND_MINAMOUNT controls how serious a wound must be before a medic considers it worthy of attention
- new option: ENEMY_MEDICS_HEAL_SELF: medics can heal themselves
- new option: ENEMY_OFFICERS_SURRENDERSTRENGTHBONUS adds a team surrender strength bonus for officers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1992 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-17 21:22:38 +00:00
silversurfer b1ebd3ea6a typo correction for ini option ENEMY_MEDICS_SEARCHRADIUS
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-17 14:29:00 +00:00
silversurfer ff01234c8c put back ini options COVER_SYSTEM_ALTERNATE_MULTI_TERRAIN_CAMO_CALCULATION and COVER_TOOLTIP_DISPLAY_DETAILED_TILE_PROPERTIES which somehow got lost during a merge
typo correction for ENEMY_MEDICS_SEARCHRADIUS

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1991 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-17 14:27:03 +00:00
Wanne 0ce71b2b95 Merged from revision: 1989
More visual enemy gear info (by Sevenfm)
- Show additional info in NCTH cursor (press ALT) (ADDITIONAL_NCTH_CURSOR_INFO = 2)
-> You can only use this feature at certain distance
- Updated 'show enemy weapon' feature (SHOW_ENEMY_WEAPON = TRUE, SHOW_ENEMY_EXTENDED_INFO = TRUE)
- Now it can show armour and face items, too. Useful for OCTH users (SHOW_ENEMY_AWARENESS = TRUE)
- Show total value of damage, absorbed by armour in last attack (SHOW_HIT_INFO = TRUE)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1990 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-16 19:35:48 +00:00
Wanne 815c44d439 Merged from revision: 7077
More visual enemy gear info (by Sevenfm)
- Show additional info in NCTH cursor (press ALT) (ADDITIONAL_NCTH_CURSOR_INFO = 2)
-> You can only use this feature at certain distance
- Updated 'show enemy weapon' feature (SHOW_ENEMY_WEAPON = TRUE, SHOW_ENEMY_EXTENDED_INFO = TRUE)
- Now it can show armour and face items, too. Useful for OCTH users (SHOW_ENEMY_AWARENESS = TRUE)
- Show total value of damage, absorbed by armour in last attack (SHOW_HIT_INFO = TRUE)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-16 19:34:16 +00:00
Wanne 072bd37325 Merged from revision: 7075
- Fixed French texts (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7076 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-16 19:25:59 +00:00
Flugente f39dc4bfca Additional tile properteis update (by anv):
- COVER_TOOLTIP_DISPLAY_DETAILED_TILE_PROPERTIES under [Tactical Cover System Settings] set to true will let "f" cover tooltip to present detailed information about tile. Only relevant (non-zero) info will be shown.
- fixed bug causing trap level to be ignored and limited final maximum and minimum camo of given map grid between 0 and 100.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7073 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-16 18:54:35 +00:00
Flugente 0aabc7eec3 COVER_TOOLTIP_DISPLAY_DETAILED_TILE_PROPERTIES set to true will let "f" cover tooltip to present detailed information about tile. Only relevant (non-zero) info will be shown. (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1988 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-16 18:52:02 +00:00
Flugente 2e773a029d - New Feature: enemies roles allows the AI to use medics and officers, and the player can now identify high-value targets among the enemy.
Requires GameDir >= r1987.

- If an enemy is spawned with a radio set, he is more likely to become a radio operator.
- It is now possible to mount a gun on prone allies if you are facing them on the right angle.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7072 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-16 18:24:40 +00:00
Flugente 7e9079ac0e New Feature: enemies roles allows the AI to use medics and officers, and the player can now identify high-value targets among the enemy.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1987 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-16 18:16:37 +00:00
Flugente bf34e90f50 Merged revision(s) 1985 from branches/ja2_data_official_2014:
Fixed typos.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1986 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-16 13:03:41 +00:00
Flugente 306fae059c Fix: missing include
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7070 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-15 19:42:25 +00:00
Flugente 7ff6a8cfa7 - New feature: Ammotype flag AMMO_ANTIMATERIEL (<ammoflag>4</ammoflag>) gives bullets the ability to destroy walls and other structures.
- Fix: Charlie's ammo was not fitting

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1984 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-15 17:55:11 +00:00
Flugente 69f4b2cf34 - New feature: Ammotype flag AMMO_ANTIMATERIEL (<ammoflag>4</ammoflag>) gives bullets the ability to destroy walls and other structures.
- Fix: SoldierToSoldierLineOfSightTest was called against NOBODY

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7069 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-15 17:54:04 +00:00
Wanne bc94c319c6 Merged from revision: 7067
- Translated missing French texts (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7068 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-15 15:50:17 +00:00
Wanne b25f678f4e Merged from revision: 1982
- Added ALL_MEANWHILE_CUTSCENE to Mod_Settings.ini to enable/disable meanwhile cutscenes (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1983 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-14 17:07:00 +00:00
Wanne 1156d646f7 Merged from revision: 7065
Fixes (by Buggler)
- Added ALL_MEANWHILE_CUTSCENE to Mod_Settings.ini to enable/disable meanwhile cutscenes
- Changed LMB behavior to open description box of item-under-mouse for valid attachment in cursor in strategic screen; hold ALT hotkey to swap valid attachment items instead (due to item under mouse will auto-move to higher priority pockets if valid attachment in cursor cannot be swapped in)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7066 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-14 17:05:35 +00:00
Wanne 28f8878a58 - Added missing <ASSIGNMENT> to Military Headquarters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-14 13:08:25 +00:00
Wanne d74f1798b0 Merged from revision: 7062
- Translated some French texts (by hrvg)
- Fixed texts in other languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-14 13:04:27 +00:00
Wanne 3590cd96cc Merged from revision: 7060
- Externalized hardcoded "Player strength / Enemy strength" surrender values display text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7061 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-13 07:46:22 +00:00
Flugente 679e443b42 Merged revision(s) 1980 from branches/ja2_data_official_2014:
- new background ability: disarm_trap alters effectivity at defusing bombs
- lowered signal shell light duration

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1981 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-12 22:32:22 +00:00
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 1b0592629d Merged from revision: 7055
- Translated French.PocketPopups.xml (by hrvg)
- Added French translated file CampaignStatsEvents.xml. Currently the game does not support French.CampaignStatsEvents.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-12 17:07:23 +00:00
Flugente f6ffee0583 Merged revision(s) 7052 from branches/ja2_source_official_2014:
- Fix: Assertion if groupsize exceeds garrison size
- Fix: mobile militia never decides to move

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-11 22:48:13 +00:00
Flugente d83ae2a4c8 Merged revision(s) 7049 from branches/ja2_source_official_2014:
Fix: problems with loading IMP profiles between different game versions (checked on IMP from 6670, 6901, 7047) (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7050 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-11 21:26:11 +00:00
Flugente 3bf5a1328b Merged revision(s) 1978 from branches/ja2_data_official_2014:
Improved faces for Bob, Doc and Skitz (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1979 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-10 19:57:01 +00:00
Wanne ca35c38b48 Merged from revision: 1976
Feature Improvement: Fast Forward Turn (by Sevenfm)
0 - default behaviour
1 - auto fast forward only invisible
2 - auto fast forward always

AUTO_FAST_FORWARD_CIVS = 0
AUTO_FAST_FORWARD_CREATURES = 0


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1977 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-10 19:20:02 +00:00
Wanne b6796d022c Merged from revision: 7046
Feature Improvement: Fast Forward Turn (by Sevenfm)
0 - default behaviour
1 - auto fast forward only invisible
2 - auto fast forward always

AUTO_FAST_FORWARD_CIVS = 0
AUTO_FAST_FORWARD_CREATURES = 0

- Minor cosmetic fixes/improvements

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-10 19:19:23 +00:00
Wanne 3cc123e4b1 Merged from revision: 7044
Updated language specific gamedir files
- Translated French xml files (by hrvg)
- Fixed comment in *.LoadScreenHints.xml (max characters from 254 to 190)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7045 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-10 07:36:21 +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 f2710790c5 Merged revision(s) 7040 from branches/ja2_source_official_2014:
Fix: if using scope modes, basic weapon item boni were always added, even if another scope was currently used.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-09 16:45:09 +00:00
Wanne 03fcdb9a74 Merged from revision: 7038
- Added support for language specific PocketPopups.xml (*.PocketPopups.xml)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-08 13:27:47 +00:00
Wanne 529a9e798a Merged from revision: 7036
- Press 'd' in realtime to activate turn based mode immediately (by Sevenfm)
o This only works if enemies are in the sector
o You will return to realtime if no enemy contact for 2 turns, as usual
o Useful for sneaking in some situations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-08 13:01:50 +00:00