100 Commits
Author SHA1 Message Date
ChrisL 9b566f502c Fixed a NCTH bug where a negative PercentCap would not calculate properly because the uiCap variable it applies to could not support signed results.
Fixed a NCTH bug where a negative PercentTargetTrackingSpeed would not calculate properly because the uiTilesForMaxPenalty variable it applies to could not support signed results.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-06 21:19:52 +00:00
ChrisL 75e797f9ae BUGFIX 551: Prior fix would allow items to be auto placed into the wrong sector if you had a sector inventory panel already open. The code should now realize that the wrong sector inventory screen is displayed, close that screen, switch to the correct sector, and then open the sector inventory panel before placing the item into sector inventory.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4573 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-14 16:46:14 +00:00
ChrisL 49a7405861 BUG 551: Items auto placed into world inventory might accidentally be dropped into the wrong sector. Now, when you're on the map screen, the sector inventory panel is closed, and you try to drop something into the world, sector inventory should automatically open so that items can be placed directly to the sector panel.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-14 16:07:41 +00:00
ChrisL af82df815b Corrected Vision Range Bonus display issue on UDB.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-12 19:23:31 +00:00
ChrisL 69e0832a88 Bug 540: Fixed issue where CTRL + SHIFT + A was creating full ammo crates without consolidating any ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4553 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-02 06:21:05 +00:00
ChrisL bf4ae66494 BUGFIX 538 - Added a condition so that if a door is not openable, iChance will be reset to 0 in time for the merc to make the "this is impossible" speech.
2nd correction.  My fix left iChance uninitialized when the personality modifiers were being applied, meaning they no longer counted.  I've put the iChance initialization back where it was and slightly altered the condition so we simply resent iChance to 0 when the lock is impossible.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-21 16:54:24 +00:00
ChrisL edf1aaa302 BUGFIX 538 - Added a condition so that if a door is not openable, iChance will be reset to 0 in time for the merc to make the "this is impossible" speech.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4517 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-21 16:46:35 +00:00
ChrisL 9073f66572 BUGFIX 536 - Fixed it so we don't lose items when attempting to hand an invalid item to an NPC.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4516 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-21 16:07:49 +00:00
ChrisL 19416a395b BUGFIX 534 - Added code to restrict non-ammo item status to 100.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-21 15:33:39 +00:00
ChrisL 4adeed2f4b BUGFIX 479 - Because GearAimBonus was altering iSightRange during the CTH calculation, it was possible for an apparently visible target to be effected by the SHOOT_UNSEEN_PENALTY. By moving the penalty directly against iChance, this should resolve this.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-14 15:05:36 +00:00
ChrisL d9437117bb BUGFIX 523 - When retreating from combat, the code was designed to add 5 minutes to the game clock. Not sure why. Possibly to resolve an exploit? Anyway, if another travel group had an arrival time within that 5 minute span, an Assertion error would result. This fixes that by removing the 5 minute "retreat charge".
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4500 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-14 14:43:30 +00:00
ChrisL 11889ee846 BUGFIX 527 - Corrected weapon placement when 2handed weapon is held in off hand during a successful steal attempt.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4499 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-13 16:47:21 +00:00
ChrisL 2bd354af32 BUGFIX 522 - Coded some popup box position adjustments so that popup boxes can't be drawn off the screen.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-13 16:33:38 +00:00
ChrisL ba81d0de5a BUGFIX 526 - Bullet graphic rendering was causing an internal display error when attaching/removing Ammo attachments from the tactical panel. We don't need to actually redisplay the bullet graphic, however, in order to change the text that's on the bullet graphic.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4491 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-09 17:36:58 +00:00
ChrisL a9a88e4642 BUGFIX 525 - Corrected UDB display issue where ammo and RangeBonus are concerned.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-09 16:43:02 +00:00
ChrisL 7ddd54134f removed unnecessary weapons.xml write procedure from the ReadInWeaponStats function.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-09 15:34:57 +00:00
ChrisL b8e5ebcf6c BUGFIX 514 - A vector error in the size of the world inventory was causing a mouse button to be deleted twice resulting in an assertion error.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-07 18:16:56 +00:00
ChrisL 61fac0c0f8 BUGFIX 501 - portraits weren't being re-initialized when changing the TOPTION_SHOW_TACTICAL_FACE_ICONS parameter.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4484 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-07 16:30:51 +00:00
ChrisL 1652167097 BUGFIX 500 - Corrected "equiped" spelling error
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-06 23:56:35 +00:00
ChrisL 3f9cb6b833 BUGFIX 497 - Aim Level function was not allowing negative aim levels which might initially make sense, but if any modifiers would result in a negative value, we'd end up with an high value which would then get reset by the built in limits. I've recast the variable to an INT8 which will allow negative results, at least prior to the built in limits being applied.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-06 23:09:16 +00:00
ChrisL 7376ffbb68 BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-06 22:28:19 +00:00
ChrisL 42a2130043 BUGFIX 484 - Appears that some of the SM Panel pockets were out of alignment by 1 pixel to the right. I'm not sure if this is because of a recent sti alteration or if this has always been the case but the code has been updated to account for the current STI coords.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-06 21:06:06 +00:00
ChrisL ab7ecb51e6 BUGFIX 482 - Corrected several variable definitions so that large mag capacity is better supported.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4478 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-06 20:37:23 +00:00
ChrisL 25133e0afe BUGFIX 480 - When disarming a bomb when your inventory is full, the merc actually disarming the bomb will now be the active "ItemPointerSoldier".
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-06 19:44:37 +00:00
ChrisL dffb0fc7fe Found a bug in the russian text file that was preventing the creation of russian builds.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2738 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-13 22:31:39 +00:00
ChrisL b69207b743 Disabled some of the charges associated with the Increased Aiming Costs option.
Corrected a AP display issue when you had to turn while a weapon was not in a ready position.
Updated build version.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-13 21:43:14 +00:00
ChrisL a2740bfbdb Bugfix: APs to shoot when weapon not ready and we have to change facing was displaying wrong.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-11 00:24:35 +00:00
ChrisL 36eb308270 Made an APBPConstant a little clearer. Before it was labeled as part of the suppression system when in reality it's not.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 20:43:52 +00:00
ChrisL 23a8f63bd8 Corretion to the 100AP/HAM integration. Also made an APBPConstant a littler clearer (hopefully).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 19:25:24 +00:00
ChrisL 72174db37c Updates to the HAM/100AP integration.
Added Min/Max Suppression Tolerance values (from Headrock).
Bugfix: Took away the ability to reload a weapon from the item description box while using an ammo crate.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 15:28:41 +00:00
ChrisL f91bc180ad The valid range for Price_Modifier is (-1)-100. -1 & 0 were added as options some time back to allow the game to dynamically adjust the Price_Modifier value based on game progress.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-06 17:53:44 +00:00
ChrisL 1d6f96553a The valid range for Price_Modifier is 0-100. 0 was added as an option some time back to allow the game to dynamically adjust the Price_Modifier value based on game progress.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-06 17:50:23 +00:00
ChrisL c947784561 Minor fix to allow the bullet graphic to render properly when the shopkeeper panel is open.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2634 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-24 23:08:25 +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
ChrisL f64f58fbf8 Bugfix: I've simply added a condition to a pair of assertions so that they won't run when a soldier is assigned to a vehicle.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-12 16:51:34 +00:00
ChrisL e646ffda20 Resolved an assertion error that occurs when retreating from a sector while inside a vehicle.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-08 16:53:45 +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
ChrisL 8505cd45cd Fixed a crash/freeze that could occur when trying to Sell All or Delete All items while the item description box was open.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-06 16:33:16 +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
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
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 1424b3c3d3 Added maximum and minimum values for the AP_BONUS settings in the INI file.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2443 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-04 17:36:19 +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
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
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
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 8c437af085 Resolved a Strategic AI.cpp assertion error resulting from army composition values totaling more then 100%.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2389 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-30 16:03:40 +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 7bd9d49e7c One more change to BRs to display the correct AP label.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2382 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-21 17:09:37 +00:00
ChrisL e7049a63db Fixed a glitch with the AP display in BRs.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2380 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-21 16:55:32 +00:00
ChrisL 33a9f17760 Bugfix to resolve an assertion error relating to the helicopter.
Change to BobbyRays information as proposed by Headrock.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2379 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-17 15:56:58 +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 fa21f87a59 Tron and Kriplo's fix for the "off-by-one" bug.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2373 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-10 22:47:07 +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 7e1d4a2d89 Fixed a capitalization error that was stopping the editor from compiling.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-30 16:21:02 +00:00
ChrisL 92b1865817 Map editor changes from Kriplo (DNL).
Adding roads from “Draw Roads” selection will first remove exact the same road tile object before placing the same again at the same location.  
Adding roads from “Place banks and cliffs” option now will not put same road in same map element just once.  
Whenever you chose to place rocs,bu ches,tree,junk, or any what call PasteStructureCommon() will first remove exact element before it put again.  
“Fill area” will not go to endless recursion loop when try to fill inside buildings, ending with stack overflow.  


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-26 23:41:37 +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 f7ffba090e Fixed an assertion error that occurs if you try and save a game immediately after an autobattle has completed.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-19 18:25:17 +00:00
ChrisL 87fbb6f4d9 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor. (part 2)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-19 16:28:13 +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
ChrisL feb713ff0e Another tweak to the language system for cities.xml.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2321 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-29 22:59:38 +00:00
ChrisL 0a1b40237d Updated code to support language specific cities.xml.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-29 16:12:08 +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
ChrisL a1a00fbf59 Russian language updates.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-08 18:10: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
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
ChrisL 6438f9164d Corrected a display problem with the KeyRing popup when playing in OIV mode.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-07-11 16:49:12 +00:00
ChrisL a2c73aab6d Fixed the MapEditor configuration so that it will compile a "release" version of the editor instead of the "debug" version that had been created. People should use this updated configuration to generate the Map Editor instead of messing with the defines in the builddefines.h file.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-06-25 15:33:58 +00:00
ChrisL b2b42e1958 I blew it and missed the fact that SpaceViking was still using the old structure in his test code.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2208 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-30 15:43:51 +00:00
ChrisL bab3a586d7 Added new weapon jam code from SpaceViking (think that's who wrote it).
Updated the text files and moved a static phrase into the language specific files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2207 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-30 15:32:54 +00:00
ChrisL 0fc5fd8e10 Turned A* Pathfinding off until someone can resolve the infinite loop issue that is occuring on custom maps.
Updated the 1024x768 tactical graphic coords to fix a "blacked out" display issue.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-29 15:15:03 +00:00
ChrisL 51d541f29c Turned on Abends so they appear rather then having the program simply CTD.
Setup a failsafe in the pathfinding system that will force an abend should the system fall into an infinite loop.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2194 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-21 16:55:38 +00:00
ChrisL 6565f14bc3 Fix for Bug#99
Fix for Bug#100

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2170 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-16 17:25:46 +00:00
ChrisL c448713412 Minor adjustment to the NIV mode 800x600 thigh and combat pack pocket coordinates on the tactical panel so that the stealing menu doesn't inadvertantly "double hatch" our pockets and make them look solid black.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2124 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-09 22:28:59 +00:00
ChrisL 0527d0a585 Minor update so that sector A9 will be the default map when a major version update has completed.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2111 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-07 16:06:23 +00:00
ChrisL 82aec44382 Fixed bug #82: SHIFT+N allowed both sun goggles and NVGs to be worn at the same time.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2108 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-06 17:32:34 +00:00
ChrisL 8e332178e4 Made an adjustment to the editor so that map version checking takes place when rebuilding the DevInfo folder. This will allow maps to update properly if you switch between maps alot, while not forcing a major version update when it's not needed.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2096 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-02 23:09:58 +00:00
ChrisL 07549fdc68 Resolved a problem where ItemSize=99 items would cause a CTD because of a mission condition.
Adjusted the ALT+W function so it runs a bit better.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-02 16:39:16 +00:00
ChrisL 5a57354297 Fixed item "beaming" bugs that allowed items to be grabbed from a sector your merc wasn't currently in.
Fixed the map editor so that "Nada" items don't appear in the item lists.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-29 17:33:49 +00:00
ChrisL e2ad50963b Bugfix that removes a rare CTD that can occur if a non-LBE item accidentally gets associated with a merc.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2077 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-25 18:17:53 +00:00
ChrisL b4b31cdb06 Fixed a CTD that occurs when closing sector inventory while the item description window is open.
Added a new ALLOW_SECTOR_DESCRIPTION_WINDOW flag to the ja2_options.ini that allows players to turn off the stack popup and item description functionality for the sector inventory panel.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-21 21:04:35 +00:00
ChrisL ece7ec25bb Resolved an inadvertent memory leak I put into the code while fixing a previous CTD.
Cleaned up the cursor graphics so that the cursor is properly updated when reloading stacks of weapons from the stack popup screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-21 06:39:01 +00:00
ChrisL 896891431d Fixed a CTD that occured when reloading a weapon from the sector inventory panel.
Fixed the sector inventory panel so that you could reload weapons that could be stacked.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2046 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-18 22:41:09 +00:00
ChrisL 38ee990e9f Bugfix to stop a CTD that could occur if the system inadvertantly tries to stack two money objects that have a 0 uiMoneyAmount amount.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-18 05:21:01 +00:00
ChrisL 2d5c6e2996 Fixed a bug in the "sell all" strategic inventory screen options. Money now gets sold without modification and unreachable items can't accidentally be sold.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-17 16:47:50 +00:00
ChrisL bffdfcc75d Fixed an OIV mode bug where RPCs don't get initial gear at hire.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-16 16:42:43 +00:00
ChrisL 4ccad69873 Updated version number.
Bugfix to resolve a Map Editor problem where you would constantly receive a "Major Version Update" message.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2032 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-15 18:56:39 +00:00