Commit Graph
433 Commits
Author SHA1 Message Date
Wanne 4c6df7cc2c Quickfix: New option "Force turn mode" is always disabled when playing a multiplayer game
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-14 16:32:44 +00:00
ChrisL 5815b01f6a Added a condition which should stop the blue asterisk from appearing on an item unless that item is of item class IC_LBEGEAR.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-12 18:16:26 +00:00
ChrisL 6be3de2149 Fix movement cost problems in 100AP. Externalized the movement cost modifiers and changed the run modifier from a divisor to a flat modifier like other forms of movement use.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-09 23:14:43 +00:00
Wanne e3303e321c Fix was lot by merging
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2616 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-02 16:07:48 +00:00
Wanne 8afd965a5e Chinese Fixes (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-02 07:22:05 +00:00
inshy 74bd6ca4b3 Fix from Heinz:
1) Fixed error creating new soldiers in DoReinforcementAsPendingEnemy
2) Fixed some bugs in Shopkeeper interface.
3) Fixed CTD when pressing Alt-Y not in cheat mode
4) Save/load screen shouldn't appear during quickload

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2612 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-01 18:22:56 +00:00
Wanne c4e483539f Updates / Fixes by Arynn
- Fixed: Mercs randomly drop aimed weapons automatically under some weird circumstances 
- Fixed: Merc are now a little more "talkactive"
- Update: New option screen with "Next" and "Prev" button. This allows "unlimited" of options in the option screen
- New: New "Forced turn base mode" option in the option screen and also available via keyboard shortcut (CTRL+ALT+SHIFT+T) in tactical.
This forces the game to go in turn based mode when there are enemies in the sector.

INFO: There is a new STI Graphic (OPTIONSCREENADDONS2.sti) which is needed for the updated option screen.
You can download the file from http://ja2.h758491.serverkompetenz.net/Wanne/NewOptionScreen/OPTIONSCREENADDONS2.sti
Put this file in your Data\Interface folder. If I build a new release I will upload the file to SVN GameDir and then remove it from my private download folder.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-28 09:16:25 +00:00
Wanne d86193fe97 Externalized Chinese specific (unicode) texts to _ChineseText.cpp and saved the Unicode files back to ASCII (thx to Kriplo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2574 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-03 19:19:33 +00:00
Wanne 8b0305e221 Chinese specific update (by zww from tbs)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-31 18:20:16 +00:00
Wanne a6adf843b8 1) some fix in russiantext.cpp (by inshy)
2) fixed mistakes in UFS web page (was missing ","), add missing line (by inshy)
3) added russian layout for IMP Begin screen, now russian users can type name of they heroes using russian letters. Fixed position for male\female text in russian version (by Heinz)
4) fixed wrong position for items in inventory (by Heinz)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-21 15:21:36 +00:00
SpaceViking f26095d86f Space Viking's many mercs changes plus numerous generic bug fixes
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-15 01:26:13 +00:00
ChrisL ddd90f5317 Bugfix: Corrected the shopkeeper interface so that the clock and town strings are displayed in the correct location.
Bugfix: Added a condition so that the clock doesn't try to display on the SM Panel while in NIV mode.  It was displaying, just hidden under the radar screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-08 16:41:34 +00:00
ChrisL 7e7c27b61d Bugfix: Removed the ability to manually jump fences while wearing a backpack.
Bugfix: Force shopkeepers to drop LBENODE items to the ground instead of trying to return them to the soldier during a sale.  This keeps items in the LBENODE from being lost.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2472 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-06 17:14:43 +00:00
SpaceViking 5c9ff9cbc4 Use local buffer for storing modified string instead of original copy
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-15 23:32:24 +00:00
Wanne e95d4b8bca VS 2008 project files update
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2453 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-12 20:21:32 +00:00
ChrisL fc3e66444a Fixed a breath issue where it required more damage to really knock an opponent out in anything but 25AP mode.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2452 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-11 23:45:09 +00:00
Wanne 599f658232 Updated VS 2008 Project Files (thx to BirdFlu)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-10 20:57:37 +00:00
ChrisL e21506c5a5 Adjusted the system that dynamically adjusts AP/BP values so it would round negative numbers better.
Fixed an INT8 redefine of AP values which was causing AP values larger then 127 to become negative numbers.
Fixed an autofire glich that would allow you to empty an entire mag while using the xxx_AP_BONUS settings in the INI file.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-10 19:46:50 +00:00
Wanne 86b02ea67e Externalized always using "prof.dat" (ALWAYS_USE_PROF_DAT in ja2_options.ini) for any difficult level. This makes sense for modders (thx to Scorpion)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2449 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-09 18:55:32 +00:00
ChrisL 276306c435 Merged the two parts of RenderItemDescriptionBox function (strategic and tactical) into a single function. Now any change automatically effects both version of the box.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2444 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-04 22:00:29 +00:00
ChrisL 92219f3e5a Altered the RemoveRegion failsafe so use the REGION_EXISTS flag. This seems to resolve the "timed" crash and/or infinite loop that people have been reporting with sector inventory.
Added a cheat hotkey that creates a huge variety of items for troubleshooting sector inventory with multiple pages.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2442 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-02 22:57:32 +00:00
ChrisL 0b390536b5 An AP value was being recast to INT8 which caused some issues with more then 127APs.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2441 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-01 17:17:11 +00:00
Wanne 9d08dd56a1 Updated VS 2008 Project Optimizations to VS 2005 Project Optimizations (Result: Build smaller Executables)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-24 19:26:52 +00:00
ChrisL c1fed7af99 Fixed a CTD that occurs when you fail to attach an item.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-24 16:27:20 +00:00
Wanne 647afe10c8 Added VS 2008 solution and project files
To compile with VS 2008 you have to disable the fist line in "Standard Gaming Platform\input.cpp". Just look for comment "// VS2008"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-21 22:15:22 +00:00
Wanne 032fd1f353 - Added Chinese language support (thx to Noword from TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2424 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-20 07:43:57 +00:00
ChrisL 55059caf3b Fixed some display values in EDB to properly switch between 100AP and 25AP.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2422 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-18 16:09:53 +00:00
ChrisL 944dacd8a4 Fixed a 100AP conversion issue for morale and suppression fire.
Fixed a CTD caused by trying to "pickup" an item from sector inventory while simultaneously looking at that items description box.
Upgraded an INT8 to INT16 in training functions to try and catch a problem with INI values being set too high.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2419 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-15 00:12:34 +00:00
Wanne ac6de87d47 Multiplayer: Override panel key is now bound only to key "7" instead of 5, 6 and 7
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2418 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-14 15:23:34 +00:00
ChrisL 905ce20125 Enhanced Description Box, v1.3. By Headrock
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-13 01:11:59 +00:00
ChrisL 3cd3ef39cb 100AP project integration
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-06 00:46:54 +00:00
ChrisL 26f5a83bab Fixed attachments so that trying to attach a loaded UGL onto a weapon that already has 3 attachments will fail instead of causing an assertion error.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-30 19:58:26 +00:00
ChrisL ef158c56cf Correction to the AutoBurst penalty, by Headrock
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-30 02:56:38 +00:00
ChrisL 2eb729ab31 Headrock found a bug in the CTH calculation with regards to autofire penalties.
Think I've fixed a glich where mercs who were already in a sector (but not active) could not be placed on the tactical placement screen (either because of an assertion error or simply being told the placement wasn't valid).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2385 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-28 18:41:22 +00:00
ChrisL 26201b3816 Updated build number
--Editor fixes from Kriplo
Implementation for mouse wheel support
Implementation for mouse middle button support
Fix for adding on roof tiles
Fix assertion when leave editor mode
On saving map check of entry points are add
Fix for to many ToolTip messages in place walls
Fix assertion on loading map without entry points
Fix assertion in Sector Summary if DevInfo directory not exist
Fix for problem of losing map edgepoints
Fix problem with losing stuff from LBE
Fix crash in meanwhile
--Fixes from Headrock
Fixed a typo in the Health experience calcuation for strategic movement
Added "Draw" cost to weapons help data


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-13 21:05:28 +00:00
ChrisL 1278c52d9a Bugfix for IMP attributes.
Fixed loop/crash that occurred when handing MADLAB a weapon with a permanent attachment.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-07 22:35:48 +00:00
ChrisL 6f2af55cba Fixed assertion error caused when switching from strategic to tactical with a dead merc in the current team.
Fixed a bug where hired RPCs would not get items stored in their gunsling or knife pockets.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-23 23:14:49 +00:00
ChrisL 3e8d006329 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-19 16:27:07 +00:00
ChrisL 0e4c2ab79c Updated the shopkeeper display so that items being offered for sale by the shopkeeper display their highest unit cost instead of the stack cost.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-15 20:43:49 +00:00
ChrisL e6f9406ffe Fix sector inventory so that right-click closes the panel when ALLOW_SECTOR_DESCRIPTION_WINDOW is FALSE.
Removed the "Major Version Update" system from the map editor.  Now, maps will be updated only when they are actually loaded.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-11 14:57:12 +00:00
Wanne eae98df88d - externalization: Restrict female enemies from being in the queens army (except Female Elite enemies)? -> RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-09 16:26:51 +00:00
ChrisL 7e37a07476 Fixed the sector inventory so that you can right click to look at an item's description even if you don't have an On Duty merc in the sector. You still need a merc in sector, but they can be involved in another activity where before they also had to be part of an active unit.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-12 17:09:29 +00:00
ChrisL 382fff0437 Possible fix for the intermittent sector inventory right-click issue.
Fixed the display AP cost for shooting (when you also have to change facing and/or ready a weapon) so that it correctly matches the APs that are really charged.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-08 23:26:20 +00:00
Wanne 15e7e467e5 New exe build (2296)
- A* enabled

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-06 19:01:39 +00:00
ChrisL 94ef5885bc Adjusted the ChangeDropPackStatus function to account for "range to backpack" when enemies are in sector.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-06 16:33:52 +00:00
ChrisL 0b25d91e0e Corrected a graphic rendering issue with attachment alignment on the strategic screen.
Corrected a problem with IMP hiring that caused an assertion error when trying to use the last female IMP profile ID.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2292 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-05 18:22:22 +00:00
haydent 768ad6ea74 hope to fix mp ctds, line 922
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-07-25 23:03:43 +00:00
ChrisL 411bec6fc4 More random number adjustments from SpaceViking.
Adjusted the default file location so that it doesn't point to a specific drive but, instead, creates builds in whatever driver your code is located on.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-07-23 18:12:48 +00:00
ChrisL 75c937544a I messed up one of SpaceVikings changes. This corrects it.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-07-18 18:29:30 +00:00
ChrisL ec87dd51e6 SpaceViking's random number and CTH adjustments.
OIV Graphic alignment correction.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-07-17 00:16:16 +00:00