7604 Commits
Author SHA1 Message Date
Wanne 8e4c2b74c1 Multiplayer Bugfix:
- Fixed problems after hosting game in strategy screen (crashes, options not clickable, ...)
o The problems seems to be the reworked taunts initialization from revision 6640. I did not trace down the exact problem, but taunts should anyway be disabled in a multiplayer game
o Now taunts are disabled in a multiplayer game which fixes the above problems

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-25 08:45:50 +00:00
Wanne 4d16001c18 Small convenience feature - improved bomb planting (by Sevenfm)
- new INI option: IMPROVED_BOMB_PLANTING
- With new option IMPROVED_BOMB_PLANTING = TRUE, if you hold SHIFT key while planting new mine, then another mine with same item id will be taken automatically from your merc's inventory. If no such item found, any mine will be taken. If you plant tripwire-triggered mine, then only tripwire-triggered items will be taken. This new feature work only in realtime.
If you are making tripwire network, then this feature can be used to plant another tripwire item with network and hierarchy settings taken from previously planted tripwire. You just plant tripwire as usual, selecting it's settings from dialogue, then if you plant another one while holding SHIFT key, those settings will be used for new tripwire, instead of showing you dialogue
- I hope this small improvement will save you some time for building large and complicated defensive minefields.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1882 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-24 11:09:22 +00:00
Wanne 376b174d5b Small convenience feature - improved bomb planting (by Sevenfm)
- With new option IMPROVED_BOMB_PLANTING = TRUE, if you hold SHIFT key while planting new mine, then another mine with same item id will be taken automatically from your merc's inventory. If no such item found, any mine will be taken. If you plant tripwire-triggered mine, then only tripwire-triggered items will be taken. This new feature work only in realtime.
If you are making tripwire network, then this feature can be used to plant another tripwire item with network and hierarchy settings taken from previously planted tripwire. You just plant tripwire as usual, selecting it's settings from dialogue, then if you plant another one while holding SHIFT key, those settings will be used for new tripwire, instead of showing you dialogue
- I hope this small improvement will save you some time for building large and complicated defensive minefields.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-24 11:01:45 +00:00
Wanne dd3bbca604 Activated new ja2.ini entry (by Buggler)
- MERGE_INI_FILES = Ja2_Options.ini
- Very useful for players to maintain their custom ini settings in a 'portable' form across different mod and time dimension as some players will just gave up on trying another mod while going thru the humongous settings again and again.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6644 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-24 10:50:58 +00:00
Wanne 1b06a4b85c Activated new ja2.ini entry (by Buggler)
- MERGE_INI_FILES = Ja2_Options.ini
- Very useful for players to maintain their custom ini settings in a 'portable' form across different mod and time dimension as some players will just gave up on trying another mod while going thru the humongous settings again and again.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1881 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-24 10:50:50 +00:00
Wanne b629f91e72 - Deleted old unused Encyclopedia XML file
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-24 10:47:28 +00:00
Wanne 3d0afbd63f - Updated Chinese Mercedt files (by zwwooooo)
- Deleted old unused folders for Chinese version (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6642 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-24 10:43:48 +00:00
silversurfer a45c56466f fixed wrong item class for RPO-M launcher
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1880 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-24 09:15:37 +00:00
silversurfer a7d887b462 fixed RPG launchers with wrong item class
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1879 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-24 09:12:43 +00:00
Wanne bec015359a Fixes (by Sevenfm)
- Fixed small bug : SHIFT+ALT+C always showed enemy mines, even without metal detector.
- Fixed: incorrect tripwire hierarchy calculation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6641 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-22 21:56:06 +00:00
Wanne ba5edad40c Enemy Taunts Updates (by anv)
- taunts will be loaded from any file in TableData/ that follows EnemyTaunts*.xml naming convention (and [LanguagePrefix]EnemyTaunts*.xml for translations)
o eg: EnemyTauntsKill.xml, EnemyTauntsComeback.xml, German.EnemyTauntsKill.xml, Chinese.EnemyTauntsComeback.xml, ...
- <uiIndex> for taunts in every file should start from 0 and increase normally
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327830/5.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6640 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-22 21:50:00 +00:00
silversurfer ebfb3c1e15 fixed incorrect <usItemClass> for LAW (item 51)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1878 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-22 17:53:18 +00:00
Wanne 08236ee9f4 Added VS2013 solution and project files (by JMich)
- You can also open them with VS 2012
- I just changed the toolset for all projects to V100 (VS 2010) instead of V120 (VS 2013), because I don't have VS 2013 installed. If anyone can't compile with VS 2013, we simply switch back to V120 toolset

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6639 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-21 07:57:52 +00:00
Wanne 353d83e6a9 Added new/updated enemy taunts
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6638 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 13:28:43 +00:00
Wanne 6cb135cd53 Enemy Taunts Update (by anv)
- replaced 5 different riposte tags with one <riposte_quote>XXX<riposte_quote>, where XXX can be any quote number, that taunt is supposed to be answer to. All but quotes 20-22 use random enemy witnessing quote to taunt, these three - last attacker.
- added above ripostes + some more.
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327830/4/Externalised_taunts.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1877 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-20 13:27:22 +00:00
Wanne 5168970f40 Enemy Taunts Update (by anv)
- replaced 5 different riposte tags with one <riposte_quote>XXX<riposte_quote>, where XXX can be any quote number, that taunt is supposed to be answer to. All but quotes 20-22 use random enemy witnessing quote to taunt, these three - last attacker.
- added above ripostes + some more.
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327830/4/Externalised_taunts.html


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 13:26:40 +00:00
Wanne 2dd7104354 Editor Bugfix: Added item stack no info for pre-placed map items (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 12:48:29 +00:00
Wanne af6fc83fd9 - Changed language back to ENGLISH
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 07:54:07 +00:00
Wanne 874193d197 Fixed VS 2012/2013 compilation errors (by JMich)
- Solution and Project files for VS 2013 will follow
- It still compiles and works in VS 2005/2008/2010 :-)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6634 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 07:52:55 +00:00
Wanne 9607922a07 Map Editor (by Buggler & Kriplo)
- Added tile index no info to editor selection window

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 07:13:11 +00:00
Wanne 1e36829064 - Added new enemy taunts to *.EnemyTaunts.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-19 08:25:24 +00:00
Wanne c21af51bac Updated Enemy taunts feature (by anv)
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/328330.html#Post328330

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1876 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-19 07:53:34 +00:00
Wanne 47210f9b14 Updated Enemy taunts feature (by anv)
- ridiculous amount of tags: attack, hit, miss, kill, head pop, blinded, type of attack, is target a zombie...
- ripostes to merc quotes,
- taunts can now make noise,
- bumped up amount of taunts to respectable 733, mostly thanks to your contributions guys,
- accidently squashed bug with incorrect noise notifications ("hears scream" instead of "hears explosion" etc.)

Ripostes
At the moment enemies can react to quotes "enemy detected", "1st enemy detected", "multiple enemies detected", "bullet flew by", "under heavy fire", as these are most likely to be used in combat. In the first three cases, riposting enemy will be chosen randomly from all enemy witnesses, latter two - last enemy to attack this merc will taunt.
Enemy's riposte will come as soon as merc quote is finished.

Noisy taunts
Taunts can be handled like other noises in game - shots, explosions, etc., meaning:
- they will be displayed only if someone from our team is close enough to hear them,
- they can be heard even if you don't see enemy (with twist of his name changed to "unknown voice". Yay.)
- volume of taunts is configurable in .ini.

see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327830/4.html



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-19 07:52:51 +00:00
Wanne 33c557b59d - Fixed typo in *.EnemyTaunts.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6626 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 19:52:12 +00:00
Wanne 5570b757d6 - Fixed typo in EnemyTaunts.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1875 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-18 19:51:42 +00:00
Wanne 496616a2bd Fixed screen not refreshing for '1' - '4' Bobby Ray hotkeys (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 19:42:33 +00:00
Wanne 2ebc9ae65b - Updated Chinese texts (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 19:39:00 +00:00
Wanne 79a62c1750 Fixes (by Buggler)
- Fixed CTD when displaying militia assignment box that has regions beyond sector P16
- Corrected variable for heli tile gridno calculation 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 08:26:42 +00:00
Wanne bee0294665 Updates (by Buggler)
- Added hotkeys in personnel screen
o 'LEFT ARROW' and 'RIGHTARROW' for merc scrolling; 
o 'UP ARROW' and 'DOWN ARROW' for switching between stats, employment and inventory;
o 'Shift + TAB' for switching between current team and departures
- Fixed hardcoded text in personnel screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6622 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 08:25:53 +00:00
Wanne e3fcde11fe - Added "Data-UB/TableData/Map/*.Cities.xml" (currently only in English)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6621 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 08:23:42 +00:00
Wanne c2bfac48d7 - Updated missing *.FacilityTypes.xml entries
- Added missing *.Cities.xml
- Updated Chinese.Cities.xml (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 08:19:18 +00:00
Wanne 4e37d4402f - Translated Chinese.FacilityTypes.xml (by John_5696)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 08:06:33 +00:00
silversurfer e00ed535a5 - updated smoke dummies (by Sevenfm and wil473)
- added <NotBuyable> to item 1699

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1874 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-18 07:48:00 +00:00
Wanne e520ef186f - Updated texts for Chinese Version (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-17 10:56:35 +00:00
Wanne de8e001fb0 - Updated texts for Chinese version (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6617 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-17 10:55:16 +00:00
Wanne cacefd093a - Translated Chinese texts in Chinese.Vehicles.xml (by John_5696)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6616 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-17 10:52:09 +00:00
Wanne 9bc09aff3d - Multiplayer Bugfix: Fixed M.E.R.C inventory glitches on laptop site
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-16 18:35:55 +00:00
silversurfer 5878355d61 This revision requires GameDir 1873 to work because of a new icon in ItemInfoAdvancedIcons.sti!!!
- Weapons.xml tags <bRecoilX> and <bRecoilY> are now FLOAT type values. This allows to differentiate weapons by smaller steps.
- Items.xml tags <RecoilModifierX> and <RecoilModifierY> are now FLOAT types as well.
- Items.xml tag <PercentRecoilModifier> will now be displayed in UDB advanced tab.
- Item_Settings.ini has new modifiers for gun type specific <bRecoilX> and <bRecoilY>. This allows modders to quickly adjust recoil values for any gun type.
- fixed UDB description for <RecoilModifierX> and <RecoilModifierY>
- All recoil calculations now use FLOAT values for more precision.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6613 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-16 16:55:32 +00:00
silversurfer 9f206f2ab2 - new icon 62 in ItemInfoAdvancedIcons.sti for displaying PercentRecoilModifier in UDB
- new item property modifiers in Item_Settings.ini for recoil of guns

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1873 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-16 16:27:07 +00:00
silversurfer f986cc1292 Externalizations and fixes (by Buggler)
- Externalized heli tile index for helisites.xml
- More checks and fixes for hidden towns and sam sites to be hidden in infobox

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6611 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-16 10:45:00 +00:00
silversurfer a920a3eadf - Added new tags for heli tile index and missing tag in helisites.xml (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1872 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-16 10:44:13 +00:00
Wanne dad39391ce - Updated _ChineseText.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6609 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-16 10:23:38 +00:00
Wanne 23e02580bf - Moved text L"%" from source code files (ANSI encoding) to the language specific CPP files (UTF 8 encoding)
o For example, Chinese exe can't display "%" in ANSI files
o STR16 sSpecialCharacters[]

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6608 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-16 10:21:43 +00:00
Wanne 57dd52a839 Small changes and fixes for grenades and explosives (by Sevenfm)
1) Fixed small bug when MAPELEMENT_PLAYER_MINE_PRESENT was set after planting explosives with remote detonator.
2) Arming bomb with only remote defuse attached is not allowed. 
3) Showing item locator before "add blueflag" messagebox is disabled for our mines as it was annoying and you anyway know that it is here.
4) Total weight for throwing range is calculated for all items (previously it was calculated only for grenades).
5) Grenade-throwing formula and demolitions bonus applied only for hand-thrown grenades (check for TOSSCURS). Previously it was applied for launched grenades too.
6) Changed grenade throwing range formula from

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6606 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-15 19:51:12 +00:00
Wanne c9d626d004 - Externalized heli refuel sites (Map/HeliSites.xml)
- Added more default tags to empty startinggearkits
- Added comments to minerals.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1871 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-15 19:37:06 +00:00
Wanne bb5b5e21d6 Externalized heli refuel sites (by Buggler)
- Map\HeliSites.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6605 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-15 19:33:10 +00:00
Wanne 4ad50accc6 - Fixed hidden towns and sam sites a dead giveaway when calling info box in strategic screen (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6604 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-15 19:28:27 +00:00
Wanne ba31e849e4 - Translated Chinese Texts (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6603 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-14 22:24:55 +00:00
Wanne d15714a737 - Updated Chinese GameDir files (by zwwooooo)
- Fixed wrong MercEdit folder for Chinese Version -> MercEdt (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6602 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-14 22:24:18 +00:00
Flugente cbbcbf48c0 Various fixes (by Buggler):
- Fixed IMP Background hardcoded text: Prev, Next & None.
- Fixed unable to proceed to IMP Attribute screen when Merc Background feature is off
- Changed 'Ore Type' text to 'Resource'

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6599 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-14 18:35:16 +00:00