7604 Commits
Author SHA1 Message Date
Wanne 411fdd1584 - bugfix: Bug #79: Creatures are gone if you compress time in strategic and select auto battle
- bugfix: Bug #51: Speck sends wrong mail if any of the 4 new guys (Text, Stogie, Biggens, Gaston) level up.
- added missing description texts for IMP skill rooftop sniping and camouflage (also translated in german and russian)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1796 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-12 18:56:38 +00:00
Starwalker f91a630e23 added SR-2 Veresk, but only with Gyurza mag available at the moment, 30rnd mag will come later. (pic by Coolberg)
changed several Burst Penalties (lowered them, where they were the same as Autofire Penalties)
changed attachment data on several guns (thanks to Hairysteed)
changed definition of vehicle slots a little bit

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@934 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-12 08:27:16 +00:00
Starwalker 7593674a4c replaced Baikal MP-233 pic (Coolberg)
added 30rnd Veresk mag pic (Coolberg)
added Veresk pic (Coolberg)
replace Ceramic and Titanium Plate pics (KenNoOni)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@933 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-12 08:16:18 +00:00
Wanne 31ba967436 - Intro is always played now (iPlayIntro = 1), until I can update (have write access) the ja2.ini in the GameDir
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-10 07:42:59 +00:00
Wanne e41a905c51 - added a new option in ja2.ini (PLAY_INTRO) + source code where the user can enable or disable the intro.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-10 07:36:22 +00:00
Wanne c55b927f8b - bugfix: Bobby Rays filter buttons (again). Now it should work
- bugfix: Hand to hand combat (knifes, claws, ...) was disabled in auto battle. This was done in revision 51 because of CTDs that always occured there. I enabled hand to hand combat and tested ~50 auto battles. No single CTD. It seems that the CTD has been fixed since revision 51.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-09 09:41:24 +00:00
Wanne df8b135b52 - bugfix (workaround): Most of the Sir-tech credits name were displayed in dark blue color. Now all credits name are set in "dark-white" color regardless of the font color code.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1784 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 17:14:52 +00:00
Starwalker 9ea8cae190 replaced Russian.AmmoStrings.xml with one made by inshy
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@930 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-07 15:22:12 +00:00
Starwalker e7910114f7 added Russian.cities.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@929 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-07 15:19:34 +00:00
Wanne 8232957994 - Enabled music in windowed mode (was missing in windowed mode)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 09:37:12 +00:00
Wanne bb1b1eaf7e - bugfix: Filter buttons under used category
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1782 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 07:58:03 +00:00
lalien 56e3a24535 - changed Russian descriptions
- bug fix for bug #50 'Monsters win auto battle'

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1757 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-24 12:39:50 +00:00
Starwalker 762dc2ab14 forgot another needed change in pockets.xml :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@928 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-24 08:59:38 +00:00
Starwalker 509c497e5c added a Burst Penalty to the Calicos that did not have one, because they can have the triggergoup as an attachment
corrected the price of the Colt Python
used pType-tags in pockets.xml as preliminary work for ChrisL's NIV Beta10
changed filled size of backpacks (to avoid exploits)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@927 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-24 08:34:44 +00:00
Starwalker 0d050203b5 added Pipe Wrench as a close combat weapon, but it is nowhere sold at the moment!
added another SL8-version as the result of a merge
changed Shovel to close combat weapon
changed Barret to use new pic
changed standard 7.62x25mm (Tokarev) ammo to AP/FMJ because of its reputation
moved the four NIV default items to lower itemnumbers due to XML-constraints
changed revolvers to have SwapClips=1 to avoid strange results from ChrisL's new reloading code.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@926 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-21 09:43:51 +00:00
Starwalker d174aad3d3 added Pipe Wrench pic (Kaerar)
added camoed Barret pic (Kaerar)
added another SL8-version (Kaerar)
replaced HK G11 PDW pic (Kaerar)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@925 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-21 09:34:05 +00:00
Starwalker d129e4c939 corrected a few weights
corrected a few descriptions
corrected a few accuracy values
introduced four new items that are useless for gameplay but are needed for the compatibility of the 1.13 XML-Editor with the New Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@922 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-15 12:21:56 +00:00
lalien 77e2b4e176 - changed Russian descriptions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-15 11:12:06 +00:00
Overhaul 6049e8da5a Added property pages to make it easy to change build language (at least with VS2K5)
Added support for Russian city names and Items
Fixed contract length exploit (hire merc for 2 weeks for the price of 1 day)
Fixed insurance emails repeating when you choose "delete" but then say no
Corrected UTF-8 to wide char translation on Windows platforms (Windows doesn't handle mbstowcs correctly)
Moved UTF-8 to Wide Char translation for item descriptions and names so it happens at XML load time (fix bug that Russian has half the description space)
Fix overflow when combining two items with high counts (such as 200-round boxes of ammo)
Path AI fixes
Fixed issues with non-interruptable animations causing infinite clock
Fixed some issues with soldiers not reaching their plotted destination
Fixed escorted players who were cowering, being unable to move after joining party
Only allow militia to climb roofs if their orders allow them to move
Fix bug where AI might climb the wrong roof on the way to the destination roof
Allow AI who have gone outside their patrol grid, to return to the Grid


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-09 02:08:39 +00:00
lalien 144426e896 - fixed Russian text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1674 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-17 18:18:21 +00:00
Starwalker b0657b6d65 corrected some item descriptions (thanks to inshy)
added a few attachment data for some NewInv-only items (should not hurt standard JA2, stand-ins are in place [items 1197, 1198, and 1199; should not be deleted])

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@921 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-17 14:46:16 +00:00
lalien 45b492c94a - replaced Russian characters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-14 11:24:32 +00:00
bugmonster c33b00d6ff - additional text moved to _*Text.cpp for localisation purposes
- refined Russian text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-12 18:21:35 +00:00
bugmonster 2ab1e53459 - fixed bug, appearing as overlapping text in insurance web-site on high screen resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-12 18:18:43 +00:00
Starwalker 345bfec3cf added mssing SCAR barrel merge (WP-version)
changed Russian caliber of UDAR-Revolver
changed/corrected a lot of other Russian stuff (names, weights, descriptions)
increased coolnes of HK G11-PDW and Mauser M-03
added data for a new NewInv LBE-item

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@920 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-11 08:57:17 +00:00
Starwalker 2819990fc3 replaced pic of NADA items (Marlboro Man)
replaced pic of Retractable Baton (Marlboro Man)
replaced pic of Flash Suppressor (Tbird)
added pics for later use in NewInv (Marlboro Man)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@919 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-11 08:50:11 +00:00
Starwalker d1d3d64785 dropped weight of RPG-27 from 8.0kg to 7.5kg
made Kevlar&Leather Jacket a unique item again (Angel quest)
renamed built-in grenade launcher of Groza rifle to GP-25
added ability to attach Reflex Sight to Steyr ACR
halved reload time of HK G11 (because of magazine rails on gun)
made SAW-pouch ammo-exclusive and gave ammobelt silhouette to it
gave medium general silhouette to former TNT-pocket.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@916 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-27 14:25:43 +00:00
Starwalker 91a7400b96 changed all Automag pics (new ones by Tbird)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@915 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-27 14:20:50 +00:00
Starwalker 9b3ed4dd4c changed graphics pointer of M224 in items.xml to 343 instead of 0 (got a new pic, but old pic still needed for NADA items)
changed some attachments on some machineguns
deleted cave vision bonus on NVG-I
replaced description of CAWS (Kensuke), but had to shorten BR-description
renamed Frag Grenade to Mk2 Defensive Grenade and changed description (Kensuke)
new German.Items.xml (Farmer Toby)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@912 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-15 07:58:32 +00:00
Starwalker c8e1776901 replaced pics of HiCap Colt pistol, FR-F2, and M224 Mortar (Tbird)
NADA items will keep the old mortar pic.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@911 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-15 07:52:50 +00:00
bugmonster 9d716dcaae - fixed bug when merc cannot automaticly leave the ring after boxing. This happens when SOLDIER_ENGAGEDINACTION flag is set.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-14 16:55:07 +00:00
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