Commit Graph
7637 Commits
Author SHA1 Message Date
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
Wanne 6ec2a96173 - Used externalized hardcoded texts for "Prev" and "Next" on the IMP background pages
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6598 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-14 07:36:40 +00:00
silversurfer 7a5fda48d4 Bugfix JaggZilla #532
Robot was limited to 6 bullets per autofire and wasted additional AP.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6596 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-13 21:14:51 +00:00
Wanne 4a49630c75 - Fixed compilation error with disabled zombies (// #define ENABLE_ZOMBIES)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6594 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-13 18:15:07 +00:00
silversurfer d41ea7f6c2 Bugfix for JaggZilla Bug #587
Objects thrown at civilians don't hurt them anymore. Anybody else will still suffer -1 health.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6593 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-13 11:09:39 +00:00
Flugente f60a8b2120 Fix: first gamestart helidrop after starting exe had wrong dropoff gridno
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6590 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 18:08:45 +00:00
Wanne 6157807cc9 - Added *.Minerals.xml files (currently only with English texts)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 14:22:05 +00:00
Wanne 52163edb4c Translated Chinese XML files (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 14:21:21 +00:00
Wanne 7081976f16 - Translated Chinese texts (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6586 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 14:19:30 +00:00
silversurfer 8257d11276 -Fix for throwing explosives with attachments (by Sevenfm)
Weight is now considered correctly.

-Civilians now take care not to step on player placed tripwire. (by Sevenfm)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6585 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 11:46:45 +00:00
Wanne 63ebacb730 New Feature: Different Mineral Types for Mines (by Jazz & Buggler)
- Instead of only having Gold and Silver for Mines, we can now add more mineral types (-> TableData\Map\Minerals.xml)
- The initialization of the mineral types of the mines is done in LUA (Scripts\initmines.lua)

- Example: https://ja2svn.dyndns.org/source/ja2/trunk/Documents/1.13%20Modding/Modding%20Examples/New%20Minerals-Mines%20Example.zip
o In this example we have a new mineral type (Oil) and the Cambria Mine (H8) becomes a Refinery

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1870 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-12 09:58:46 +00:00
Wanne 010e967948 New Feature: Different Mineral Types for Mines (by Jazz & Buggler)
- Instead of only having Gold and Silver for Mines, we can now add more mineral types (-> TableData\Map\Minerals.xml)
- The initialization of the mineral types of the mines is done in LUA (Scripts\initmines.lua)

- Example: https://ja2svn.dyndns.org/source/ja2/trunk/Documents/1.13%20Modding/Modding%20Examples/New%20Minerals-Mines%20Example.zip
o In this example we have a new mineral type (Oil) and the Cambria Mine (H8) becomes a Refinery


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6584 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 09:58:18 +00:00
Flugente 3751e7507b Changed mousewheel replacement keybind from [ALT] + [t] to [o]
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1869 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-11 22:14:40 +00:00
Flugente c85471ecd6 If USE_AIMED_BURST and AIMED_BURST_ALTERNATE_KEY are TRUE, we now use [o] intead of [Alt] + [t] to toggle aiming. This is for people who have no working mousewheel and thus couldn't aim with auto-only weapons.
This is necessary as [ALT] switches the mousewheel function between increasing aiming levels and adding more bullets.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6583 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-11 22:11:45 +00:00
Flugente 679c357c23 added picture for radio set (by smeagol)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1868 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-11 20:35:31 +00:00
silversurfer d7fa19068f - New camo handling:
Camo Kits can now only be used to paint naked skin which usually means face and hands. Clothing will take care of the rest Together they can reach 100% camo.
CAMO_KIT_USABLE_AREA = 5 in Ja2_Options.ini sets the area that can be painted.

CAMO_LBE_OVER_VEST_MODIFIER = 0.2
CAMO_LBE_OVER_PANTS_MODIFIER = 0.6
These two set the amount of camo that armor vest/pants can provide if LBE is worn over them.
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327902/Re_Code_Snippets.html#Post327902

- New Mine avoidance for civilians (by Sevenfm)
Civilians can now avoid player placed mines.
CIVILIANS_AVOID_PLAYER_MINES = TRUE in Ja2_Options.INI takes care of that. I set the default to TRUE which will allow players to use mine fields in city sectors.
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327817/Re_Code_Snippets.html#Post327817

- Smoke effects and explosive attachments (by Sevenfm)
Normal explosions can now cause a smoke effect. Explosives can be attached to other exlosives to create a more potent bundle. Ja2_Options.INI has some new options for that:
ADD_SMOKE_AFTER_EXPLOSION = FALSE
ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE
ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327918/Re_Code_Snippets.html#Post327918


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6582 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-11 12:51:33 +00:00
silversurfer 4dee3218aa - New camo handling:
Camo Kits can now only be used to paint naked skin which usually means face and hands. Clothing will take care of the rest Together they can reach 100% camo.
CAMO_KIT_USABLE_AREA = 5 in Ja2_Options.ini sets the area that can be painted.

CAMO_LBE_OVER_VEST_MODIFIER = 0.2
CAMO_LBE_OVER_PANTS_MODIFIER = 0.6
These two set the amount of camo that armor vest/pants can provide if LBE is worn over them.
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327902/Re_Code_Snippets.html#Post327902

- New Mine avoidance for civilians (by Sevenfm)
Civilians can now avoid player placed mines.
CIVILIANS_AVOID_PLAYER_MINES = TRUE in Ja2_Options.INI takes care of that. I set the default to TRUE which will allow players to use mine fields in city sectors.
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327817/Re_Code_Snippets.html#Post327817

- Smoke effects and explosive attachments (by Sevenfm)
Normal explosions can now cause a smoke effect. Explosives can be attached to other exlosives to create a more potent bundle. Ja2_Options.INI has some new options for that:
ADD_SMOKE_AFTER_EXPLOSION = FALSE
ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE
ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327918/Re_Code_Snippets.html#Post327918


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1866 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-11 12:50:06 +00:00
Wanne a8e1dfe83b Adjustments (by Buggler)
- MERCS_RANDOM_BELL_DISTRIBUTION = True for bell curve distribution; False for uniform distribution in Ja2_Options.ini
- Turn off MERCS_RANDOM_STATS
- Double MAX_MERC_DEATHS in 1.13 as current AIM + MERC roster is twice that of vanilla

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1865 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-11 09:57:51 +00:00