7621 Commits
Author SHA1 Message Date
bugmonster 574b8e3218 - Improved compatibility with different russian JA2 distribs' resources
- International/russian *.npc file format unified, performed conversion on-the-fly
- New 1.13 messages' text moved to Text.h/_*Text.cpp
- Russian translation fixed/refined

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-12 18:40:15 +00:00
Overhaul ed5fb7dec8 Fix infinite recursion for tank sighting. This could have a side effect of causing sight glitches, but that's much better than a stack overflow/CTD.
Added SNIPER orders to soldier debug info screen


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1589 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-09 09:14:41 +00:00
Overhaul 11c4d9648e Added memory leak detection to "new" operator
Prevent merc in slot 0 from disappearing due to errant schedule.  Still need to find and fix schedule though
Prevent attempts to turn or climb roof when soldier collapsed
Fix problems when mortar or RPG randomly assigned to a soldier but cannot be added for whatever reason
Pathing favors beginning path on orthogonal and using as few turns as possible (mostly old behavior).
Prevent interruptions when soldier climbs up, which can cause fall into building just below the target roof position
Fix pauses due to soldiers hurt in previous turn
Fix soldier path not reaching destination when thrown by explosion damage or heavy gunfire
Restore pathing to cave and underground exits
Fix too many AI ending up on the roofs


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-09 09:10:40 +00:00
Starwalker db3ce86a53 added Colt Python and FR Ordnance MC51 (pics by Tbird)
added a Flare (pic by Kaerar), which has shorter duration than the breaklight
breaklights have smaller radius now

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@908 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-05 07:20:09 +00:00
Starwalker 423d4b82b0 replaced pics of Remington, Ithaca, and Street Sweeper shotguns (Coolberg)
added pic of another LBE-vest

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@907 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-05 07:16:24 +00:00
Starwalker 1aaa00ba9b new German designations/descriptions (Farmer Toby)
repaired M1 sound entry

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@904 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-01 08:42:13 +00:00
Starwalker 3135f70e0e added MC51 pic for later use (Tbird)
added Flare pic for later use (Kaerar)
replaced Sungoggles pic (Marlboro Man)
replaced M79 and Blaser pics (Marlboro Man)
replaced Franchi and Benelli Shotgun pics (Coolberg)
replaced PPsh41 pic (Coolberg)
replaced BigItem pics of G36 family (Coolberg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@903 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-01 08:29:48 +00:00
Overhaul 51539605f5 ADB's fix for wandering shopkeepers and other civs
Fix for medics in autobandage trying to open locked or trapped doors and causing UI lockup due to door open menu popup


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1550 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-25 09:20:28 +00:00
Overhaul a1ac43ee58 Fix for clock problem when dual wield or auto-fire causes a soldier to turn on the first shot but knocks him down on a successive shot
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-23 08:06:02 +00:00
Starwalker 2f8563c97c added Automag V, M1 Carbine, KAC PDW, and Magpul PDR
added 30 round AP and HP mags for the new PDW-type guns (6x35mm caliber)
added P-08 Parabellum pistol and M1 Carbine to EnemyGunChoices

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@900 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-22 06:39:37 +00:00
Overhaul b0b9d14154 Fix AI soldiers losing ready stance while deciding next move
Fix LUA crashing when game shuts down (caused by incomplete merge)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-21 05:43:45 +00:00
Overhaul 13288fd750 Fix memory leaks in strategic pathing
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 08:40:25 +00:00
Overhaul b170dbb1e5 Fixes to reduce the number of compile warnings. Still many more to fix
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 08:32:53 +00:00
Overhaul 4bb41616eb Fix to prevent rain and storm from happening at once
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 08:28:50 +00:00
Overhaul 035359edf0 Fix AI units to reload/rechamber off-hand when necessary
Fix to prevent soldiers from climbing the wrong building while moving toward a disturbance
Fix to prevent soldiers from doing nothing when a climb point is not nearby
Fix improper indexing of directions

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 08:19:17 +00:00
Overhaul dd0d6ea66d Fixed appearance of save game corruption when a game with different inventory set is loaded. Note that such games can still cause odd behavior and CTD's
Fixed old-style behavior when creating a soldier struct (caused memory corruption and leaks)
Fixed soldiers unable to fire if an error happened while firing the off-hand weapon
Fix animation system problems with soldiers interrupted while changing stance, such as twitching and not being able to navigate around obstacles
Prevent splitting money while an item is in the hand, which would result in losing the original item
Fix reverse of X,Y when checking visibility through a roof, which could make soldiers falsely visible/invisible
Prevent militia from simply waiting on the border when enemies are known to be in the sector
Fix stack overflow for soldier inventory debug display
Optimized A* pathing and cleaned up VS2K5 specific code
AI can now use all climb points for climbable buildings, not just a random few
Fix to not allow flat roof butted against slanted roof to be identified as a climb point
Prevent soldiers who cause an interrupt from a special action from continuing on their path after being interrupted
Prevent soldiers who enter or leave deep water from moving a space too far and turning back
Prevent soldiers from trying to crouch while in shallow water
Make soldier turn in the closest direction when he must get up from prone and turn then fall back to prone
Allow a soldier to swat for a tile before returning to prone if unable to return to prone immediately after a turn
Fix civilians that should show up in a sector, missing because of others that aren't
Fix a memset on a C++ class
Place Skyrider in a sector near his helecopter once available and the helicopter is present
Fix soldier corruption if too many shots burst-spread into too few tiles
Include both first and last tile in spread when some locations must be skipped
Fix to shoot at last location in burst
Fix to remove other previous spread locations when calculating a new spread
Fix to reload or rechamber off-hand when necessary, such as having a pistol shotgun in that hand


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1532 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 08:09:03 +00:00
Overhaul eeb82168b5 Fixed update of items for which auto/burst does not apply when swapped into the hand
Moved helicopter in Estoni so that it is unblocked by a weed and can therefore appear completely
Fixed conditions where the game should remain paused but doesn't, and where it should unpause but doesn't


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1531 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 07:13:44 +00:00
Overhaul e879d3103c Removed some unnecessary anonymous structures
Fixed print-screen for full-screen mode


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 07:05:06 +00:00
Overhaul b25087e3e8 Added LUA support:
Control over rain and ambient light, as well as light fixtures
 Ability to change number of static enemies in a sector
 Ability to create enemy groups and set their waypoints
 Ability to set soldier APs, change stance, and change level


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 07:01:16 +00:00
Overhaul ea68cd14ff Added profiler support
Fixed memory leak and CTD with editor summary info
Added extra VS2K5 property pages for debug support


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1528 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 06:56:34 +00:00
Starwalker 6d62f584f1 changed Rifle LAM/Flashlight Combo to new pic
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@899 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-18 07:11:13 +00:00
Starwalker ee830d5b52 replaced HK SL8 pic (Coolberg)
added several gun pics for later use (Tbird)
added a new pic for Rifle LAM/Flashlight combo (but old pic stays as well, if needed for UC)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@898 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-18 07:07:07 +00:00
Starwalker 39391c3990 added CETME Ameli
Changed HK MG36E to HK MG36 RAS
added HK MG36
added mergability of various G36 rifles with rail-kit or optics-grip to obtain other versions
disallowed Rifle LAM and Rifle LAM/Flashlight combo on Bundeswehr G36 versions as these have no forward rails.
added grippod attachability to G36 RAS versions
corrected price of Match Sights ($1 was much too cheap ;-)
changed vision bonus of attachable scopes to reflect effect of ambient light (or lack thereof)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@895 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-12 06:57:28 +00:00
Starwalker 5824af525a replaced pics of Ruger Mini 14, Winchester 94, M1 Garand, Mosin-Nagant, Kar 98k, and Mauser M03 (Coolberg)
replaced pics of M72 LAW and HK SL9SD (Tbird)
replaced several LBE-item pics (Marlboro Man)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@892 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-12 06:52:15 +00:00
Wanne b43ec593fe - bugfix: for expert difficulty level, that leads to adding INSANE_ELITE_BONUS after applying of EXPERT_ELITE_BONUS (thx to Scorpion)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-11 18:05:50 +00:00
Starwalker 1d7b92dc20 missing pics for new items :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@891 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-01 12:02:25 +00:00
Starwalker 5b9ae6454c changed more attachment weights
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@888 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-01 09:55:25 +00:00
Starwalker 764523c045 more sound changes by Farmer Toby
description change of SIG MP41 by Farmer Toby
added three WW-II era scopes (M1 Garand, Mosin Nagant, and Kar 98k lose the ability to mount ACOG but get their respective original scopes instead), pics by Tbird
added Match Sights (pic by Tbird)
added Underarmor Shirt (pic by Marlboro Man)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@887 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-01 07:06:53 +00:00
Starwalker aafd39c201 sound allocation (Farmer Toby)
German designations (Farmer Toby)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@886 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-30 15:31:21 +00:00
Starwalker feec1fdc3a sound file allocation xmls (Farmer Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@885 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-30 15:30:13 +00:00
Starwalker 329abacbe7 shifted one sound file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@884 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-30 14:40:30 +00:00
Starwalker 6a89976bbd new gun sounds added (Farmer Toby)
some gun sound-files renamed for easier work with the XML-Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@883 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-30 14:37:27 +00:00
AalaarDB ece5d551c1 Fixed bug where if a merc with an extended ear, and out of normal talking range, tried to interact with a shopkeeper the game would crash.
Now the merc will run up to the shopkeeper and then interact.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1444 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-28 00:38:47 +00:00
AalaarDB 5df2c69d10 Readded AStar code, see email for more details.
Fixed bug in AStar code.
Fixed night combat chance to hit
Optimized worst case scenario pathing to be faster.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1438 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-25 21:37:01 +00:00
Starwalker e55ae97228 new gun sounds added to sound-xmls and weapons.xml (Farmer Toby)
some attachment weights corrected to have more realistic values

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@882 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-25 11:37:05 +00:00
Starwalker e684da67ed added several new gun sounds and replaced Stechkin sounds (Farmer Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@881 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-25 11:34:34 +00:00
SpaceViking 0d820f3c43 Fix problem where nothing can be picked up from the strategic screen.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1431 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-25 05:19:36 +00:00
SpaceViking 79333dbf84 Initialize variables to code that adds soldiers onto tactical field
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-24 05:37:53 +00:00
lalien ebd1e97d37 - removed variables that are not used
- some fixes on soldier direction calculations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1403 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-20 14:35:33 +00:00
lalien 5a0abb4a14 - Removed non backward compatible code due to violation of §20 of JA2 1.13 Development Rules
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-20 13:43:27 +00:00
Starwalker c4e2b896b4 corrected wrong index for Warden
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@880 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-19 08:49:35 +00:00
Starwalker 247eb99d3a replaced G36 family pics (Coolberg)
added MG36 and MG36-RAS pics in addition to replacement mentioned above (Coolberg)
added pics of G36 kits for later use
changed name of G36/G36K Tactical to G36/G36K RAS
added pics of LBE-items
increased damage of .357M and 10mmAuto guns by 1, decreased damage of .45ACP guns by 1
updated New Inventory definition XML-files (same as on FTP-site)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@879 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-18 06:55:30 +00:00
Starwalker 937ef7f998 added Sounds for 7.92x57mm and 7.92x33mm ammo
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@878 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-18 06:48:25 +00:00
Wanne ce385421f1 - bugfix: Sam sites with index >=5 lacks ability to train militia (fixed by Lesh)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1376 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-16 11:11:09 +00:00
Overhaul 5035e83261 Fixed CTD in editor when changing detailed civ placement from wheelchair to jeep
Fixed memory corruption in detailed placement due to old-inventory behavior
Added Editor.slf to files JA2/Editor will load from
Fixed FindBestPath to not search for a path to NOWHERE


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-14 07:27:14 +00:00
Starwalker 3bb01780b8 added the new explosive internal item at #270, so Overhaul's fix should be workin with vanilla JA2 as well. Also made a new explosive entry for this item in explosives.xml.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@876 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-13 08:31:45 +00:00
Starwalker 1044142484 changed the new explosive internal item from #995 to #270, so I can use the same in the Data-folder for vanilla JA2 (a hardcoded pointer uses this item).
changed description of Beowulf Rifle
increased range of Mosin Nagant to 600m
replaced pics of SKS and AKMSU (Tbird) and of MG3 (Buren)
added several gun pics (Tbird) and LBE-item pics (Marlboro Man) for later use

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@875 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-13 08:28:29 +00:00
Overhaul 2a4e963983 Fixed a problem with wrong variable name, and modified infant spit index to match the new Vanilla friendly index
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-13 06:01:33 +00:00
Overhaul ffc70e9723 Fixed buffer overrun for LUA strings
Made direction variables more consistent as unsigned chars.  Several function prototypes updated for this.
Many memory leaks plugged:  External options, video overlays, laptop file lists, tactical message queue, strategic pathing, autobandage, merc hiring, detailed placements, crate in Drassen, tactical placement
New functions and attributes for soldiers in LUA (still for debugging at best): Soldier.APs (current APs), Soldier.changestance (changes stance, uses game heights)
File catalog ignores .SVN directories (game load speedup)
Fix CTD in mouse regions
JA2 window now refuses to move to negative coords
Checks to prevent DirectX-related infinite loops due to minimizing and task switching
Invading enemies should now appear on the borders even when reinforcements disabled in .ini
Suppression should no longer work on mercs in medium water
Infant/Young creatures use restored spit instead of Molotov
Creatures begin with their 'guns' (spit) 'locked and loaded' (cartridge in chamber)
Further fix to AXP and AlaarDB's weapon ready check:  Now 'firing' is always counted as 'ready'.
Prevent mercs from falling and flying back through obstacles
Check whether battle group is even set before testing its location for battle setup
Burst spread locations now limited to 6, the limit within the soldier struct
Extra burst spread locations zeroed out so that they aren't used unless necessary
Spread code now only shoots at locations in the spread, and will shoot at all 6
Only mercs in the sector where autobandage happens will be made to stand up after it's done
Throwing a grenade at the tail of the plane in Drassen should not result in a CTD
Reset attack busy count when loading a new sector


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1347 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-11 11:19:03 +00:00
Overhaul 20df3ca6cf Corrected spelling errors and typos in SectorLoadScreens.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@874 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-11 09:54:56 +00:00