Commit Graph
4117 Commits
Author SHA1 Message Date
Kriplo 5ba65d8377 -fix for older savegames, October 2013 or earlier (thanks to anv).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-06 19:07:24 +00:00
Flugente 12d45fcfa2 Merged revision(s) 7024 from branches/ja2_source_official_2014:
- If a merc repairs up to a threshold below 100, display a slightly different message
- Due to radio operator jamming, AI red alert can fail (intentional part of the trait). In that case, forbid the soldier from using radio again this turn, as this would be a fruitless waste of APs.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7025 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-04 22:20:32 +00:00
Wanne f03bc8ef23 Merged from revision: 7022
- Added tooltip info for for turning on/off merc light movement (|G) 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7023 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-04 17:27:15 +00:00
Flugente b39954aee7 Merged revision(s) 7018 from branches/ja2_source_official_2014:
- Fix: reloading while mercs are exiting the helicopter could lock the gamescreen.cpp
- Fix: helicopter airdrop could lock up if mercs were in a bad animation
- Fix: wrong battle report texts used

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-03 21:03:36 +00:00
Wanne baca53f566 Additional Tile Properties - Update
- Moved the global location of the xml files from the "AdditionalProperties" to the "Tilesets\AdditionalProperties" folder because this place fits better
- Of course you can also add special tilesets xml files in the tilesets specific folders "Tilesets\XX"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7017 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-03 20:55:59 +00:00
Flugente 8e06bdaf4c Update (by anv):
- fix: data read from Data/AdditionalProperties,
- new tag: <bTrapBonus> + updated data for tiles, trap level influenced by terrain,
- new feature/option: COVER_SYSTEM_STATIC_SHADOWS_DECREASE_BRIGHTNESS.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7016 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-03 20:38:26 +00:00
Flugente 95b1c783eb Merged revision(s) 7014 from branches/ja2_source_official_2014:
- Fix: snitches report mercenaries and vehicles complain about pay even if they receive none
- Fix: if NO_ENEMY_DETECTION_WITHOUT_RECON is FALSE, every sector is reported to contain enemies

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7015 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-03 20:23:13 +00:00
Flugente 17ed67f578 Fix: mobile militia no longer moves
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 16:26:49 +00:00
Flugente fcc2aa6f21 Merged revision(s) 7010 from branches/ja2_source_official_2014:
Fix: when militia picked up items, a wrong item name was displayed


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7011 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 15:11:32 +00:00
Flugente f91d1a0be9 Merged revision(s) 7006 from branches/ja2_source_official_2014:
Fix: in certain conditions, radio operators were not correctly identified to be jamming communications

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7007 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 14:12:05 +00:00
Kriplo a665154a62 Brief: //dnl ch86
- Fixing mapeditor move building and improving some related mapeditor stuff.
Details:
- Change the way exit grids are add, remove, save and load through editor, also add undo option for exit grids and you can place unlimited number of them.
- Fix incorrect gridno save in temporary map file for bigmap exit grids.
- Increase maximum number of light sprite from 256 to 4096 per map.
- Using DEL key for QuickEraseMapTile will now erase ItemPool too, and with improved function DeleteStuffFromMapTile will erase light sprites, exit grids and door locks.
- Cliff hang tiles used for middle cliffs are now possible to erase with when erase button is on.
- Add support for undo door locks, also you can now erase them if erase button is on.
- Move building function is completely rewrite and will properly move exit grids, door locks, lights and items too.
- Removing unnecessary tiles during copy building is improved too.
- Fix undo function for light sprites which now will also store all three types and undo them properly.
- Fix CTD situation if tile elements are deleted and after that items too, then undo will crash mapeditor.
- Fix spawning of item pool cursors during when adding items.
- Fix text glitches over door locks form.
- Fix sticky tooltip when loadsave screen or door locks form is active.
- High ground marking cursors will not be drawn in invisible map tiles anymore to increase speed and maybe fix some render problems but I doubt it.
- Move GLOCK_17_ForUseWithLOS item generation from init.cpp to los.cpp to avoid potential problems if global world items array not set.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7004 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 11:25:11 +00:00
Wanne db9ecb102d Merged from revision: 7002
Editor Enhancement (by Buggler)
- Hold shift to select previous merc instead of next merc when using hotkeys or associated buttons

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7003 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 09:54:55 +00:00
Wanne d2130494da New Feature: Additional Tile Properties (by anv)
- Feature can be completely disabled in .ini as COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES under Tactical Cover System Settings.

- With Additional Tile Properties it's possible to supply all tiles with additional data, just like with .jsd files, except in XML.
Files need to have same name as tile's .sti and .jsd files, and be put in \tilesets\AdditionalProperties\, or in specific \tilesets\xx\.

- With additional properties it's possible to specify which camo type, and how effectively will work on any tile. Only snow camo will work on snow covered roofs, red carpet in palace won't perfectly cooperate with urban camo anymore, thick grass in the middle of the forest will provide better camouflage than sparse grass near the road.

- It's now possible to specify footstep volume and stealth difficulty modifier of any tile. Carpets will absorb noise, tile floors amplify it, twigs laying on the tile will make sneaking harder. Choose your path carefully, taffer. 

- More infos: http://www.bears-pit.com/board/ubbthreads.php/topics/330942.html#Post330942


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7001 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-01 09:50:40 +00:00
Flugente 3ae95a6c20 Merged revision(s) 6997-6998 from branches/ja2_source_official_2014:
- Campaign stats take spy actions and SAM sabotages into account
- spy encounters are not reproted if nothing of interest happened
- Fix: error in food system automatic canteen refill
- Fix: if min enemy group size is too high, the AI never replensishes garrisons, thereby severely dumbing down the game.
- Fix: enemy groups do not receive minimum size
- Fix: enemy groups sizes are cut down needlessly


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-01 01:48:43 +00:00
Flugente 618b1c1f8a Merged revision(s) 6995 from branches/ja2_source_official_2014:
Enemy taunt boxes now appear a bit above a soldier, to not interfere with aiming.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-27 23:14:30 +00:00
Wanne 402933fa52 Merged from revision: 6993
- Bugfix: Changed font for sector loadscreens from FONT12ARIAL to FONT14ARIAL to support more characters (e.g: ')

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6994 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-27 22:22:30 +00:00
Wanne 8a9857c26e Merged from revision: 6989
Bugfix (by Buggler)
- Fixed incorrect shipping costs in BobbyR Shipment page
- Duplicate laptop webpage hotkeys (e -> Enter, q -> BACKSPACE)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-27 15:46:37 +00:00
Flugente 9e393cd5e3 Merged revision(s) 6985 from branches/ja2_source_official_2014:
- Fix: battle reports no longer report that a team came from north if it was already in sector.
- Fix: red lines at wrong locations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6986 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-26 20:59:25 +00:00
Wanne c57e3baba1 Merged from revision: 6983
Changed inventory dialog to hotkey Ctrl+[v] (before Ctrl+[i]) (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6984 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-26 19:01:34 +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
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
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
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 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
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
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 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 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 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 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 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 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
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
silversurfer 8d07ebccc0 fixed Skyrider missing face and sticky dialogue text in strategic map
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6892 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-09 08:36:11 +00:00
Kriplo ab5bfe2bf3 Brief: //dnl ch85
- Some fixing and adding position in overhead map to be in center of big map.
Details:
- Calculate overhead map cords from your current position on big maps.
- Fix incorrect placing room numbers in maps with cliffs.
- Fix CTD during deletion of sector items using CTRL+D or CTRL+Del.
- Remove light, door and item cursor and item tiles after coping building.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6888 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-08 15:20:13 +00:00
silversurfer 553171b717 Bugfix for number of minor traits (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6886 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-07 15:02:45 +00:00
Flugente 5635e84e15 Merged revision(s) 6881 from branches/ja2_source_official_2014:
- close item description box when autoplace item from sector inventory (by Buggler)
- allow toggling of item restriction only when move item button is activated (by Buggler)
- sector inventory item filter buttons now shows in 640x480 too (by Buggler)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6882 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-06 18:21:58 +00:00