7604 Commits
Author SHA1 Message Date
Wanne aef0182ae8 Merged from revision: 7182
Fixes (by Buggler)
- Show map gridno with hotkey 'F' in release build as well for more informative map-related bug reports
- Fixed skipping of bloodcat battles using hotkey 'Esc' in prebattle interface when battle initiated at strategic screen 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-02 13:40:18 +00:00
Flugente c905184889 - new background property: if <loyalitylossondeath> is set to 1, global loyalty drops drastically if the character dies (used for Miguel)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2031 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-01 23:47:45 +00:00
Flugente 95a05c2560 Merged revision(s) 2029 from branches/ja2_data_official_2014:
added neurotoxin darts to Howard's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2030 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-01 22:04:14 +00:00
Flugente c137c76bb3 Fix: do not apply disguise if we are seen by an enemy
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7181 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-01 21:53:59 +00:00
Flugente ba59e9fa5e skill menu entries can be translated
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7180 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-01 20:16:19 +00:00
Flugente 6edf7dd079 - New Feature: Enemy Generals are unique enemies whose location randomized and unknwon to the player. As long as they are alive, the enemy gets signifiant strategic boni. The player must learn of their location and take take them out, preferrably without alerting them prior.
- Covert Ops: Bleeding is deemed suspicious only if COVERT_DETECTEDIFBLEEDING is set to TRUE.
- renamed special prisoners to officers. 
- lowered the priority of enemy troops becoming medics
- prisoners in player-controlled prisons now use the prioner-colour scheme used by Shank and Dynamo


Requires GameDir >= r2028.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-05-01 13:28:33 +00:00
Flugente 8f5f51d0c2 - New Feature: Enemy Generals are unique enemies whose location randomized and unknwon to the player. As long as they are alive, the enemy gets signifiant strategic boni. The player must learn of their location and take take them out, preferrably without alerting them prior.
- Covert Ops: Bleeding is deemed suspicious only if COVERT_DETECTEDIFBLEEDING is set to TRUE. 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2028 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-01 13:24:23 +00:00
Flugente b8633434a5 Merged revision(s) 2026 from branches/ja2_data_official_2014:
AI will no longer choose illumination rounds for mortars and grenade launchers during the day

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2027 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-30 22:56:16 +00:00
Flugente a861099ac3 Merged revision(s) 2024 from branches/ja2_data_official_2014:
There is no reason why the IDs that boxers are reset to before they are reinitialised would ever need to be altered by a modder.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2025 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-30 21:39:44 +00:00
Flugente 30060f0595 Merged revision(s) 7166-7177 from branches/ja2_source_official_2014:
- Flagmasks are unsigned, and should be called and treated as such
- Fix: experience gain from interrogation was too high
- Fix: chance of a prisoner becoming militia was calculated wrong
- default weight maximum for MOVE ITEM assignment increased from 30 to 40 kg
- Fix: snitches report the same event multiple times
- Fix: snitches treat vehicles as persons
- Fix: selection of launchables is inefficient, an does not take into account wether items are depending on day/night cycle
- new key combination: in strategic, pressing [CTRL] + [E] wile both a merc's inventory and the sector inventory are open will fill the merc's inventory with sector items
- trivial code cleanup
- if prisoners are taken in a sector that houses a prison, that prison can also be selected to house them
- Fix: distributing newly taken prisoners in a prison sector no longer redistributes all prisoners, only the new ones
- GetClosestFlaggedSoldierID can also be called without evaluation of sight
- Fix: Covert Ops: throwing/lobbing items or shooting rockets is deemed suspicious behaviour
- Fix: boxing was broken by loading a savegame
- Fix: campaign history rarely recorded kills in autoresolve
- There is no reason why the IDs that boxers are reset to before they are reinitialised would ever need to be altered by a modder. Required script change in stable GameDir r2024.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7178 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-30 21:36:18 +00:00
Wanne 024519cabd New Feature: 2 new Iron Man game modes (by anv)
- Selectable at campaign start under "Extra Difficulty" label
- Soft Iron Man: No saving when in turn-based combat. Can save with enemies around (in sector) but only if still in real-time mode.
- Extreme Iron Man: No saving, except punctually at midnight - save screen opens by itself, so Player won't accidentally miss saving time window. Besides Player's save, game will be auto-saved at midnight too if auto-saving is on.
- New ja2_options.ini values for Extreme Iron Man setting: EXTREME_IRON_MAN_SAVING_TIME_NOTIFICATION, 


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2023 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-27 16:16:37 +00:00
Wanne 8b494003fd New Feature: 2 new Iron Man game modes (by anv)
- Selectable at campaign start under "Extra Difficulty" label
- Soft Iron Man: No saving when in turn-based combat. Can save with enemies around (in sector) but only if still in real-time mode.
- Extreme Iron Man: No saving, except punctually at midnight - save screen opens by itself, so Player won't accidentally miss saving time window. Besides Player's save, game will be auto-saved at midnight too if auto-saving is on.
- New ja2_options.ini values for Extreme Iron Man setting: EXTREME_IRON_MAN_SAVING_TIME_NOTIFICATION, 


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7167 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-27 16:16:14 +00:00
Wanne 6a46bcfb91 - Fixed incompatible savegames because of keys and locks externalization (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7166 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-27 15:53:44 +00:00
Wanne 4b83f3ecdd Merged from revision: 2019
Externalized keys and locks to xml (by anv)
- Locks (TableData/Items/Locks.xml): Originally 64 locks were kept in BinaryData/LOCKS.BIN. Now up to 255 locks can be specified in TableData/Locks.xml. If it isn't found, LOCKS.BIN will be loaded normally.
- Keys (TableData/Items/Keys.xml): Originally 10 keys were hardcoded in KeyTable[]. Now up to 255 keys can be specified in TableData/Keys.xml. If it isn't found, hardcoded array will be used normally. 
see: http://www.bears-pit.com/board/ubbthreads.php/topics/331900.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2020 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-24 18:36:11 +00:00
Wanne c9a9acec5c Merged from revision: 7163
Externalized keys and locks to xml (by anv)
- Locks (TableData/Items/Locks.xml): Originally 64 locks were kept in BinaryData/LOCKS.BIN. Now up to 255 locks can be specified in TableData/Locks.xml. If it isn't found, LOCKS.BIN will be loaded normally.
- Keys (TableData/Items/Keys.xml): Originally 10 keys were hardcoded in KeyTable[]. Now up to 255 keys can be specified in TableData/Keys.xml. If it isn't found, hardcoded array will be used normally. 
see: http://www.bears-pit.com/board/ubbthreads.php/topics/331900.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7164 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-24 18:35:30 +00:00
Wanne aaaa144261 Merged from revision: 7161
Show Bonus from traits and background/bonus from worn equipment (by anv)
- Just hover the mouse over the camo value and you will see the value in the tooltip
- see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/331780/%5BFeature_request%5D_Add_stealth_.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7162 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-04-21 07:24:19 +00:00
Wanne 9c6c5d8326 Merged from revision: 2017
- Fixed wrong item updates from commit 2014 (custom souns for non-guns)
o Now the hedge trimmer has the correct new sound

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2018 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-21 06:58:21 +00:00
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