7623 Commits
Author SHA1 Message Date
Wanne 9a84514beb Merged from revision: 1961
Autofire bullets (by Sevenfm)
Set default number of autofire bullets:
0 = Max bullets allowed with max aiming
1..10 = Set default number of bullets

1. For MPs and SMGs
SET_DEFAULT_AUTOFIRE_BULLETS_SMG = 1
2. For ARs, Rifles and Shotguns
SET_DEFAULT_AUTOFIRE_BULLETS_AR = 1
3. For MGs
SET_DEFAULT_AUTOFIRE_BULLETS_MG = 1

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1962 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-26 18:57:10 +00:00
Wanne cfed0ed8a1 Merged from revision: 6981
Enabled auto-taking for concertina/sandbags (by Sevenfm)
- items are taken from current merc's inventory
- works only in realtime
- when filling sandbags, filled sandbag is dropped, and new empty is taken from inventory
- you need to press [shift] while clicking with hammer for this feature to be activated

Autofire bullets (by Sevenfm)
Set default number of autofire bullets:
0 = Max bullets allowed with max aiming
1..10 = Set default number of bullets

1. For MPs and SMGs
SET_DEFAULT_AUTOFIRE_BULLETS_SMG = 1
2. For ARs, Rifles and Shotguns
SET_DEFAULT_AUTOFIRE_BULLETS_AR = 1
3. For MGs
SET_DEFAULT_AUTOFIRE_BULLETS_MG = 1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6982 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-26 18:56:22 +00:00
Wanne 9f5d441db5 Merged from revision: 1959
- Fixed errors in Enemy Taunts files (by Kriplo)
o Accent [`] -> apostrophe [']

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1960 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-26 18:46:00 +00:00
Wanne 74c47d5808 - Correct some texts for EnemyTaunts (by anv, eternal)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1957 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-26 14:54:27 +00:00
Wanne 5c49ec2ce3 Merged from revision: 6979
- Translated all Enemy Taunts to Chinese (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-26 14:48:59 +00:00
Flugente 8923608027 Merged revision(s) 6976 from branches/ja2_source_official_2014:
- Food system change: if a soldier autofeeds, he will refill his canteens if the sector has drinkable water
- do not display corruption backgriund in 1.13
- removed hardcoded direction number

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-25 20:10:38 +00:00
Flugente d55d5166cf Merged revision(s) 1955 from branches/ja2_data_official_2014:
Trait adjustments
- Raven and Lynx are sharpshooters, so they get the 'sniper' trait
- Sidney and Wink are notable throwers, so get the 'throwing' trait
- Cliff is a Doctor without any other qualities, so gets the 'Paramedic (Expert)' trait

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1956 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-25 19:24:42 +00:00
silversurfer 4ba2976817 CTRL+LeftClick on an item with an attachment in the hand cursor would attach it without any AP costs. Now the game will deduct the correct attachment AP.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6974 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-25 09:13:39 +00:00
Flugente f00bc1aa14 Merged revision(s) 6971 from branches/ja2_source_official_2014:
Fix: MERC members accounts not displayed if they were at the end of the list


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-24 21:06:37 +00:00
Flugente 8cbdbf18b5 Fix: STR stat damage from starvation was not read correctly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6969 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-23 16:58:59 +00:00
Flugente 916bf88b9d Merged revision(s) 6965 from branches/ja2_source_official_2014:
- [CTRL] + [i] in tactical calls a dialogue for sector inventory manipulations (by Sevenfm)
- [CTRL] + [c] in tactical calls a dialogue for cover/trap display modes (by Sevenfm)
- changed min value for SCOPE_RANGE_MULTIPLIER from 0.5 to 0.1 (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6966 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-22 19:32:13 +00:00
Flugente 71d85d8bb5 Fix: soldiers without a face index should not use Character Dialogue that uses face index
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6963 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-22 19:02:26 +00:00
Wanne 201fcf4001 Merged from revision: 6961
- Bugfix: John Kulba (and other NPCs) did not show up on MERC website even if MERC_WEBSITE_ALL_MERC_AVAILABLE  = TRUE (by anv)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-22 16:44:15 +00:00
Wanne 94bbd43c71 Merged from revision: 6959
- Trimmed texts for LoadScreenHints.xml to a maximum of 190 characters
o French and Chinese was not trimmed, because it is already translated. The translators have to trim them

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6960 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-21 21:25:34 +00:00
Wanne 01f0a43161 Merged from revision: 1953
- Trimmed texts in LoadScreenHints.xml to max. 190 characters

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1954 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-21 21:24:24 +00:00
Flugente 47cbae3352 Merged revision(s) 1951 from branches/ja2_data_official_2014:
Fix: Sam Garver had wrong ammo in Kits 2 & 4

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1952 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-21 20:33:26 +00:00
Flugente d888067d81 Merged revision(s) 6957 from branches/ja2_source_official_2014:
reverted length of loadscreenhints back to 190. 

Longer texts cause crashes when a hint is displayed in a log, as VIDEO_OVERLAY_DESC can only handle up to length 200, just like the description in LOADSCREENHINT_STRUCT says.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6958 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-21 18:21:20 +00:00
Wanne f564b48501 Merged from revision: 6955
- Reworked *.LoadScreenHints.xml files
  o The xml files now only contain the <uiIndex> and the <szName> attributes


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6956 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-21 09:03:58 +00:00
Wanne 7f2ec17f9b Merged from revision: 6953
- Increased text limit for load screen hints from 190 to 254
o Hopefully this does not cause any problems when rendering on the loadscreens. Tests resulted in success
- Support for localization of LoadScreenHints.xml (*.LoadScreenHints.xml)
o Now the language specific xmls only have the <uiIndex> and <szName> attributes. All other attributes are in the LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6954 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-21 09:02:17 +00:00
Wanne 36131f3bf1 Merged from revision: 6949
- Multiplayer: Only output the notification info message about stucking enemy in a CO-OP game!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6950 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-20 13:12:53 +00:00
Wanne 1e90e7447a Merged from revision: 6946
- Bugfix: Fixed wrong IMP mail result entry for Radio Operator skill

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6947 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-20 08:17:00 +00:00
Flugente 4a3ac749e9 Print out warning if militia moe is aborted due to no merc on COMMAND assignment
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6944 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-19 21:03:54 +00:00
Wanne c7bc997835 Merged from revision: 1949
- Added missing ini properties for UB-Version

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1950 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-19 13:50:52 +00:00
Flugente cee17f5651 New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.
requires GameDir >= r1946

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6943 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-18 21:26:46 +00:00
Flugente c152eaacd4 New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1946 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-18 21:23:44 +00:00
Wanne e04bff6f61 Merged from revision: 6941
- Map Editor Bugfix: Fixed corruption of gpItem variable in Map Editor Build (by Kriplo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6942 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-18 07:47:19 +00:00
Wanne 0c82f3bb26 Merged from revision: 6939
- Bugfix: Fixed crash (Access violation popup) in Release build (VS2005/2008) when quitting the game (thx Kriplo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6940 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-18 07:21:55 +00:00
Wanne 4eb243c21d Merged from revision: 6937
- Added support for language specific *.AttachmentSlots.xml files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6938 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-18 07:14:17 +00:00
Wanne 12f1fecfa4 - Reverted last commit (rev. 6935), because it was a wrong commit...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6936 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-17 09:38:29 +00:00
Wanne 977f71596a - Added support for language specific *.AttachmentSlots.xml files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-17 08:54:50 +00:00
Wanne 6254a4aa51 Merged from revision: 6932
- Added german.slf file, so it is possible to play German 1.13 version of a non German JA2 installation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-15 21:14:42 +00:00
Wanne 66d7be7378 Merged from revision: 6930
- Added EnemyTaunts xml files
o Only French taunts are translated (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-15 20:47:46 +00:00
Wanne b690da2bf0 Merged from revision: 6926
- Translated Chinese source code files (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-14 07:42:08 +00:00
Wanne 0a36e31407 Merged from revision: 6924
- Deleted "Data-1.13/TableData/EnemyTaunts", because all the taunts are now in the "Data/TableData/EnemyTaunts" folder
- Updated *.EnemyTaunts.xml files for all languages
- INFO: All the action specific *.EnemyTaunts_*.xml" files will be committed soon, when they are ready...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6925 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-14 07:37:51 +00:00
Wanne 6cc3476b89 Merged from revision: 1944
- Splitted big file "EnemyTaunts.xml" into several action specific Taunt files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1945 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-14 07:33:35 +00:00
Wanne cc75ac481e Merged from revision: 6922
- Bugfix: Localization not working for multiple *.EnemyTaunts_*.xml files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6923 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-14 07:28:56 +00:00
Wanne fd761555e6 Merged from revision: 6918
UB-Fixes
- Fixed crash when opening IMP (BSE) Email for German version
o Wrong <NEWLINE> text in EMAIL25.EDT (Line 90)
- Deleted unused AIMBIOS.EDT and MERCBIOS.EDT for French version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6919 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 17:10:09 +00:00
Wanne e0509df8d2 Merged from revision: 6916
- Fixed compilation error for JA2UB

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 13:11:21 +00:00
Wanne 42de98a9b6 Merged from revision: 6914
- Translated German.Pockets.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6915 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 12:58:51 +00:00
Wanne e6ae03cee3 Merged from revision: 6912
- Allow reading of language specific *.MercStartingGear.xml Kit names
- Fixed *.Pockets.xml not working
- Reworked a few German texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 12:57:01 +00:00
Wanne 98b1af7c23 Merged from revision: 6910
- Removed *.EnemyTaunts_Attack.xml file, because the structure is not completed
- Updated French GameDir files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6911 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 08:13:02 +00:00
Wanne 93c9242827 Merged from revision: 1941
- Removed EnemyTaunts_Attack.xml, because it is missing the action xml tags. I will add the complete file later

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1942 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-13 08:04:45 +00:00
Wanne ecc24e1466 Merged from revision: 1939
Improved Snitch Trait (by anv)
- The snitch actions can be selected in the strategy view "Assignment" menu
o Spreading Propaganda: Accessible in town sectors
o Gathering Rumours: Accessible in town sectors
o Undercover Prison Snitch: Accessible from Facilities menu (Prison)
o Preventing Misbehaviour: New Snitch Menu
o Passive Reputation Increase
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/1.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1940 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-12 17:23:44 +00:00
Wanne 11037729f0 Merged from revision: 6905
Improved Snitch Trait (by anv)
- The snitch actions can be selected in the strategy view "Assignment" menu
o Spreading Propaganda: Accessible in town sectors
o Gathering Rumours: Accessible in town sectors
o Undercover Prison Snitch: Accessible from Facilities menu (Prison)
o Preventing Misbehaviour: New Snitch Menu
o Passive Reputation Increase
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/1.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 17:22:40 +00:00
Wanne fd1a09834c Merged from revision: 6902
- Translated Polish.Items.xml (by micand1989)
- Added missing name for Speck in French UB Version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6903 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 12:03:26 +00:00
Wanne 3c95f4c9c2 Merged from revision: 6900
- Translated missing Chinese texts (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 11:53:13 +00:00
Wanne 06a832a7ab Merged from revision: 6898
- Fixed wrong/missing texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 11:45:29 +00:00
Wanne 94deceec84 Merged from revision: 6896
- Added new Enemy Taunts "Attack" file for (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6897 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 11:04:54 +00:00
Wanne 7d67ad85d9 Merged from revision: 1937
- Added new Enemy Taunts "Attack" file (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1938 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-12 11:00:27 +00:00
Flugente cb3304e93f Merged revision(s) 6894 from branches/ja2_source_official_2014:
Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-10 00:28:04 +00:00