Commit Graph
7637 Commits
Author SHA1 Message Date
Wanne 60640f8501 Merged from revision: 7159
- Fixed incomplete commit from revision 7156 (custom sounds for non-guns)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7160 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-21 06:56:39 +00:00
Wanne 4c4f471de1 Merged from revision: 2015
- Automatically return to team panel on turn end (better situation overview during enemy turn) (by anv)
  ja2_options.ini: AUTO_COLLAPSE_INVENTORY_ON_TURN_END

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2016 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-19 10:10:27 +00:00
Wanne 01e68ac2ba Merged from revision: 7157
- Fixed inventory artefacts in widescreen (by anv)
- Automatically return to team panel on turn end (better situation overview during enemy turn) (by anv)
  ja2_options.ini: AUTO_COLLAPSE_INVENTORY_ON_TURN_END

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7158 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-19 10:09:33 +00:00
Wanne 0ecf7d0370 Merged from revision: 2013
Custom sounds for non-guns (by anv)
- knives, throwing knives, blunt weapons can use attack sounds specified with <sSound> tag - previously their sound was chosen depending on animation used and hardcoded - it should open space for exotic weapons like chainsaws, lawn mowers, jackhammers, etc. If <sSound> is left unspecified, default hardcoded sound will be used normally.
- knives, throwing knives, blunt weapons, launchers on attack can cause noise specified with <ubAttackVolume>, previously it was ignored for anything but guns,
- For presentation purposes: Reuban's hedge trimmer using its original DG attack sound effect and making a lot of noise.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2014 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-19 09:25:08 +00:00
Wanne cd1c0a4e43 Merged from revision: 7155
Custom sounds for non-guns (by anv)
- knives, throwing knives, blunt weapons can use attack sounds specified with <sSound> tag - previously their sound was chosen depending on animation used and hardcoded - it should open space for exotic weapons like chainsaws, lawn mowers, jackhammers, etc. If <sSound> is left unspecified, default hardcoded sound will be used normally.
- knives, throwing knives, blunt weapons, launchers on attack can cause noise specified with <ubAttackVolume>, previously it was ignored for anything but guns,
- small fix for knife/wire cutters combo where using it on empty grid would cause deadlock during battle.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7156 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-19 09:24:17 +00:00
Wanne 4f7e06b75e Merged from revision: 7153
- Externalized hardcoded radio operator texts to language specific text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7154 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-16 19:48:30 +00:00
Wanne 7daed0845b Merged from revision: 7154
- Updated _FrenchText.cpp (by hrvg)
- Fixed missing "," in language specific text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7152 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-16 01:00:39 +00:00
Wanne ac5c9032b8 Merged from revision: 7149
Bugfix: _FrenchText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7150 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-15 18:50:43 +00:00
Wanne c2e82752d4 Fixed UB GameDir files (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7147 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-13 17:31:29 +00:00
Wanne 886889eb9d Fixed UB GameDir files (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2009 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-13 17:30:08 +00:00
Wanne b08a353c05 Allow different rules for climbing (and jumping) with backpacks (by JMich)
- ja2_options.ini: MAX_BACKPACK_WEIGHT_TO_CLIMB, USE_GLOBAL_BACKPACK_SETTINGS

MAX_BACKPACK_WEIGHT_TO_CLIMB is the maximum weight a backpack can weigh and still allow you to climb with. 
The sBackpackWeightModifier in items.xml can modify that number by either making it harder (positive number modifier) 
or easier (negative number modifier). If the sBackpackWeightToClimb is -1 (default) then the option is unused.
 
If USE_GLOBAL_BACKPACK_SETTINGS is TRUE (default), it uses the same rules for all backpacks, while if FALSE checks for 
the fAllowClimbing tag in Items.xml, and if that is true you can climb with the backpack.
 
Both options can be used at the same time, so you may climb with (for example) a malice backpack that weighs less than 5kg
(or 50 hg) but not climb with a radio set.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2008 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-11 07:25:43 +00:00
Wanne ec481e8209 Allow different rules for climbing (and jumping) with backpacks (by JMich)
- ja2_options.ini: MAX_BACKPACK_WEIGHT_TO_CLIMB, USE_GLOBAL_BACKPACK_SETTINGS
- First setting is sBackpackWeightToClimb which is the maximum weight a backpack can weigh and still allow you to climb with. The sBackpackWeightModifier in items.xml can modify that number by either making it harder (positive number modifier) or easier (negative number modifier). If the sBackpackWeightToClimb is -1 (default) then the option is unused.
Second setting is fUseGlobalBackpackSettings which if true (default) uses the same rules for all backpacks, while if false it checks for the fAllowClimbing tag in items.xml, and if that is true you can climb with said backpack.
Both options can be used at the same time, so you may climb with (for example) a malice backpack that weighs less than 5kg (or 50 hg) but not climb with a radio set.



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7146 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-11 07:16:46 +00:00
Wanne d4620ffebc Merged from revision: 7144
Updated _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7145 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-08 18:23:06 +00:00
Wanne 0c54a08683 Merged from revision: 7142
Updated French xml files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7143 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-08 18:09:41 +00:00
Wanne e0448af30d Merged from revision: 7140
Bugfix (by anv)
- possible crash when viewing general stats of machineguns with no single shot available (due to comparison feature)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7141 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-06 18:31:56 +00:00
Wanne acd6cde6ae Merged from revision: 7138
Bugfixes (by anv)
- autofeeding bug,
- drop items on dismiss optimization,
- effectiveness of suppression was increased/decreased with every influenced soldier if set to other than default 100,
- item status changed to INT16 on item create - item status is also used to specify amount of money (*50), if NPC had a lot of money in his starting gear, its amount would be incorrect.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7139 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-06 18:30:12 +00:00
Wanne 292d391633 Merged from revision: 7136
- Externalized country name and noun to cities.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7137 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-06 14:44:56 +00:00
Wanne af0f580f99 Merged from revision: 2006
- Externalized country name and noun to cities.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2007 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-06 14:44:23 +00:00
Wanne 4c0bd0e03a Merged from revision: 7134
- Externalized country name and noun to cities.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7135 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-06 14:43:48 +00:00
Wanne 9c7e84a81b Merged from revision: 7132
Enhancements (by Buggler)
- Dynamic tactical squad hotkeys only take into account squads present in sector; freed back 11-20 tactical squad hotkeys as 10 dynamic squad hotkeys would be sufficient (thanks to Sevenfm)
- Externalized 'blinded by blast' hardcoded text 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7133 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-06 14:26:49 +00:00
Wanne 9c7693678e Merged from revision: 2004
Quick inventory items (by Sevenfm)
Press [ALT] + [1..0] for quick access to predefined items in tactical:

[ja2_options.ini] (Data-1.13)
;------------------------------------------------------------------------------------------------------------------------------
; Quick items: press ALT+[1..0]
; Possible Values:
; [0] - nothing
; [-1] - HTH (punch)
; [-2] - Melee (knives)
; [-3] - Taser (Stun gun)
; [-4] - Handcuffs
; [-5] - Sidearm (pistols, machine pistols, small SMGs)
; [-6] - First Aid kit
; [-7] - Binoculars
; [-8] - X-Ray detector
; [-9] - Metal Detector
; Positive values: item id from items.xml
;------------------------------------------------------------------------------------------------------------------------------

QUICK_ITEM_1 = -1
QUICK_ITEM_2 = -2
QUICK_ITEM_3 = -3
QUICK_ITEM_4 = -4
QUICK_ITEM_5 = -5
QUICK_ITEM_6 = -6
QUICK_ITEM_7 = -7
QUICK_ITEM_8 = -8
QUICK_ITEM_9 = -9
QUICK_ITEM_0 = 1636

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2005 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-31 09:34:56 +00:00
Wanne f13a096f1e Merged from revision: 7129
Updates/Improvements (by Sevenfm)
1. Quick inventory items:
Press [ALT] + [1..0] for quick access to predefined items in tactical (ja2_options.ini: QUICK_ITEM_0 to QUICK_ITEM_9)

Press [ALT] + [`] (tilde key left to [1]) to put item back to inventory and switch hands.
The item will be put in the same slot it was taken from (unless it was stacked or game was reloaded).

2. Also a few quick hotkeys:
[ALT] + [q] - switch to sling (same as [SHIFT] + [k])
[CTRL] + [q] - switch hands
[SHIFT] + [q] - drop item from main hand to the ground

Additional info:
-some hotkeys do not work in cheat mode
-only NIV
-only one-handed items supported
-stacked items currently not supported
-remembered item slot is lost when you reload game

3. A few small fixes for dynamic tooltips and other things


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7130 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-31 09:33:51 +00:00
Wanne 181a6a59fa Merged from revision 7127
- Bugfix: Each CampaignStatsEvents entry in *.CampaignStatsEvents.xml should have exactly 9 szText entries like the base English "CampaignStatsEvents.xml" file

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7128 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-31 08:54:55 +00:00
Wanne 22b2085551 Merged from revision: 2002
- Bugfix: Each CampaignStatsEvents entry in CampaignStatsEvents.xml should have exactly 9 szText entries, so it works in multi language

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2003 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-31 08:53:47 +00:00
Wanne 3619806002 Merged from revision: 7125
- Fixed Campaign History popup text in laptop (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7126 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-30 20:39:23 +00:00
Wanne 8950598439 Merged from revision: 7123
Enhanced Description Box (EDB) Compare Feature (by anv & Buggler)
- Now, when alt key is pressed, statistics of any item displayed in Description Box will change to show comparison with another items in sector inventory, allowing for quick revision of available equipment.

Two items can be compared, if they belong to the same class, with exception of:
- armor items can be compared only if they are of the same type (vest vs vest, helmet vs helmet, no point in comparing item if it can't be replaced by),
- weapons can be compared with any other weapon (including throwing knives vs guns, knives vs blunt weapons, etc.),
- explosives - bombs can be compared with grenades too (makes sense since TNT can be armed and thrown too).

see: http://www.bears-pit.com/board/ubbthreads.php/topics/331501/Description_Box_enhancement:_C.html#Post331501

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7124 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-28 20:20:47 +00:00
Wanne aa1fa49903 - Bugfixes for Additional Tile Properties and Lightning Feature (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7122 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-28 19:59:38 +00:00
Wanne 3341992db4 Merged from revision: 7120
- Disabled militia assignment popup window when battle occurs for hostile sectors adjacent to associated town to prevent radio operator exploits (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7121 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-28 19:50:24 +00:00
Wanne 3f942b7442 Merged from revision: 7118
- Polish translations for DG merc EDTs (244-253) (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7119 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-28 19:46:13 +00:00
Wanne ed6419f841 Merged from revision: 7115
- Added new load screen hints texts to language specific *.LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7117 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-24 20:09:41 +00:00
Wanne 6c4c3a9d8c Merged from revision: 7114
Updates/Fixes (by Sevenfm)
1. Added grenade throwing range modifier to item_settings.ini:
RANGE_GRENADE_MODIFIER = 1.0
This modifier is applied to grenades and regular thrown items.
2. Changed 100 to bBreathMax in throwing range penalty calculation. This should make grenades more useful.
3. Minor visual fixes (alt healthbar placement, 'roof' text placement when SHOW_ENEMY_WEAPON is true )
4. Added xml tags for merge type <13>: you can use u.knife on tripwire roll to get 2 tripwires. Status of tripwire roll will be reduced by 2 points. 
Also lookup table for merges is updated for xml editor to work correctly.
5. Added several new loadscreenhints.
6. Press 'y' in tactical for quick transformation of item in hand - useful for switching flashlights on and off.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7116 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-24 20:08:42 +00:00
Wanne 6924efdf61 Updates/Fixes (by Sevenfm)
- Added grenade throwing range modifier to item_settings.ini:
RANGE_GRENADE_MODIFIER = 1.0
This modifier is applied to grenades and regular thrown items.
- Added xml tags for merge type <13>: you can use u.knife on tripwire roll to get 2 tripwires. Status of tripwire roll will be reduced by 2 points. 
Also lookup table for merges is updated for xml editor to work correctly.
- Added several new loadscreenhints.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2000 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-24 20:06:38 +00:00
Wanne 099030d8c0 Merged from revision: 7112
- Added language version of *.Chinese.CampaignStatsEvents.xml


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7113 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-24 09:50:49 +00:00
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