Commit Graph
545 Commits
Author SHA1 Message Date
Wanne 7ba509cd40 New "mini" Feature: Added possibility to set optional Tag <mAbsolutePrice> in MercStartingGear.xml to define absolute prices for gearkits (by Tais)
- I put both (startup and gearkit selection in BR's) the initializations for gearkit prices into if's that will check if the absolute price is higher than -1 and lower or equal to 32000 (INT16)
- I also added the reading of the tag in xml_mercstartinggear.cpp, to be able to support zero priced gearkits in absolute prices I set the absolute price of a gearkit to -1 on opening tag of a gearkit, if there's an mAbsolutePrice tag set in the gearkit it will override the value, if not nothing happens and all will behave normal
- so nothing will change in 1.13 as it is, it will just give modders the ability to set absolute prices with a new tag

TODO: Maybe we should also add this optional <mAbsolutePrice> tag to the XML Editor in the future.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-12-27 15:39:52 +00:00
Wanne 133d921328 - Bugfix: When graphical face gear (eg: SWAT Helment) was shown on the merc face (in tactical turn based), the red opponent count was hidden one layer behind the face gear.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4865 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-12-27 15:25:06 +00:00
Wanne cd9f86bb01 - Bugfixes:
o MP: Fixed crash when hiring a merc with graphical face gear and then closing the laptop (the problem was, that an initializing function was not called in a MP game)
o Fixed init problem when starting a new single player game after playing a MP game
o Reducted message lines in a chinese game in strategic view
o Shortened german text


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-12-27 13:21:27 +00:00
Wanne 7c028b4a68 - Bugfix: If SMALL_SIZE_PB = TRUE (ja2_options.ini), in 640x480 and 1024x768 the mall progress bar (rect*thin.sti) was not loaded and displayed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4858 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-12-15 10:30:37 +00:00
Wanne 6dbcb8dba9 - New Externalization: Mute when item spotted in turn based mode
ja2_options.ini: ITEMS_SPOTTED_NO_TALK

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4843 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-12-11 20:26:49 +00:00
Wanne f5e3733f62 - Bugfix: Added minimum zero condition for weapon deteriorate test as random generator is unsigned variable (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-11-18 09:02:42 +00:00
Wanne 44840ad883 - A few minor bugfixes (by Buggler)
o Tactical Real-time Retreat bugfix (Overhead.cpp)
o Enemy in pursuit mode bugfix (Strategy AI.cpp)
o History Log Entry for Autoresolve Retreat (Auto Resolve.cpp)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-11-07 09:20:18 +00:00
Wanne a2eaf80830 - Fixed text problems on money UDB popup
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4746 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-26 12:26:24 +00:00
Wanne 0ec3d6a5e1 - Animation Bugfix: When merc is standing and equipped with one handed gun (pistol) in first hand slot and 2 handed gun in second hand slot, the animation model was showing 2 pistols (fix by Sandro)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4727 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-21 05:56:02 +00:00
Wanne 73dc6f250d - Bugfix: AI acts strange (does not shoot out of weapon range, ...) when NCTH is enabled
o AICalcChanceToHitGun the change to hit is reduced to zero if the AI exceeds the gun range by 10% and is only 50% when in that range. 
o I've changed that code to use externalize the parameters to the CTHConstants.ini file. 
o The result is no change in how actual code runs but now those hard coded parameters should be modifiable.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-15 19:57:54 +00:00
Wanne b4f6c3e3ed - Bugfix: When we get 2nd robot from Madlab, 2nd robot did not have a weapon
o How you can get the 2nd robot
--> Do NOT dismiss the dead robot from the merc list, otherwise you will not get a 2nd robot
--> Give Madlab another video camera and another rifle
--> Wait one day and Madlab gives you another remote control
--> Go back to the sector where first robot was destroyed and now the robot is back. It will be placed on map edge, fully functional :)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-14 16:52:56 +00:00
Wanne fa2af2de1a - Changed the encoding for ALL language texfiles to UTF 8
o Now we can also build FUNCTIONAL Polish version with VS 2005 instead of only building with VS 2008/VS 2010

- Multiplayer fixes and improvements
o Increased MP version to v1.9
o Added and info output text when the AI interrupts the pure client, that the game could hang and the server should press ALT + E
o Disabled the possibility, that the server could always give himself the turn with ALT + E. Now when pressing '1' on the dialog instead of giving the server the turn, the dialog closes without any action
o Disabled the possibility, that the server could kick himself from the game when pressing ALT + K and then selecting '1'. The '1' button now cancels the dialog without doing any action.
o Disabled the possibility, that the server could kick a client in the strategy screen
o When client gets kicked from tactical, the game automatically switches to spectator mode for the kicked client
o Disabled Encyclopedia and Briefing room links from the laptop

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-06 16:06:33 +00:00
Wanne 6b57a9a246 - Bugfix: GAME_PROGRESS_START_MADLAB_QUEST, GAME_PROGRESS_MIKE_AVAILABLE, GAME_PROGRESS_IGGY_AVAILABLE can now be set to 0 instead of minimum 1, like it is mentioned in the ja2_options.ini comment
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-04 11:20:54 +00:00
Wanne 8931270546 - Bugfix: Crash when entering D13 in DL 1.13 in a recent game. Improved bugfix (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 20:16:06 +00:00
Wanne 5d278a3a77 - Bugfix: Encountered save somewhere that took a long time to load a sector. The problem was something like over 1400 items in a cell in the sector. I just changed the reallocation strategy to grow by 3/2 of current size rather than fixed 10 because the number of memcopy decrease significantly at risk of allocating a larger than needed array (13 resizes vs 140 resizes). That code had other problems but this helped quite a bit (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 20:06:19 +00:00
Wanne 4a72f0d75e - Bugfix: Crash when entering D13 in DL 1.13 in a recent game. Basically newLoc is greater than WORLD_MAX when path finding is used when the Drassen Mine map is first loaded in Tactical view (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4670 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 20:04:44 +00:00
Wanne e7feba6d69 - Added new running with pistol animation (by Sandro and PasHancock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 14:27:11 +00:00
Wanne bf864f4fdd - Improved tactical save code (by tazpn)
o After some investigation I determined that the one of the files in the temp folder was being written to repeatedly and on top of that opening and closing over a 1500 times
o Instead of writing to in memory arrays before writing to disk its opening many temporary files and appending data to them repeatedly
o I rewrote part of the code so that it only opened the files once and wrote to them and would create them fresh when it did.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4665 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 14:03:02 +00:00
Wanne 19d61e29cd MERGED source code from development trunk (revision: 4660)
- New big mercs with either Throwing trait or Show-Off personality use a slightly more fancy animation for throwing knives. (by Sandro & PasHancock)
o New animation files: M_K_THRO2.sti

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-25 18:14:26 +00:00
Wanne ab5faae677 MERGED source code from development trunk (revision: 4656)
- New "remote detonator animation" when using remote detonator (by Sandro & PasHancock)
o It replaces the "open door" animation when using remote detonator
o New animation files: M_USEREMOTE.sti, S_USEREMOTE.sti, F_USEREMOTE.sti

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-25 07:42:21 +00:00
Wanne 9e40cee476 - New Shortcuts (by Buggler)
New Hotkeys
o Strategic Screen:
Hotkey 'r': Mobile Milita Restrictions

o Sector Inventory (with popup text):
Hotkey ',': Previous Page
Hotkey '.': Next Page
Hotkey 'Esc': Exit Sector Inventory 

o Addtional Changes:
Bobby Ray's button text 'Punch. W.' changed to 'Blunt W.' - more appropriate & consistent with XML Item Class name

o Cosmetic Corrections in Sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-12 17:44:05 +00:00
Wanne 1687c148f9 - New Feature: Added option to disable the automatic cursor swap (between exchanging positions and other actions eg. talking). (by tazpn)
o if enabled in the option screen, the cursor will not change periodically to the exchange position.
o if enabled, you can manually exchange positions by pressing 'x'
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290487#Post290487

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-09 06:50:17 +00:00
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
Wanne c04c93857f - New Feature: Quick attachment selection (by The_Bob)
o The popup will list attachments available for the given slot on the current weapon. Ones not in sector inventory will be greyed out.
o It should show up after clicking on an empty attachment slot, provided these criteria are met:
--> we are on the mapscreen
--> the sector inventory is open
--> the selected merc is in this sector
--> there is no combat in this sector





git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-23 06:42:39 +00:00
Wanne 1a2c89eea1 - Improved Bugfix:
BUGZILLA #556: Fixed CTD if enemy bleeds to death at the end of a players turn

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4598 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 21:57:47 +00:00
Wanne f64fc4133c BUGZILLA #556: Fixed CTD if enemy bleeds to death at the end of a players turn
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 20:55:09 +00:00
Wanne fa20d0c079 BUGZILLA #557: Fixed CTD when entering Estoni I6 (fix by TheBob)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4595 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 20:41:58 +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
Wanne 085180af3d BUGZILLA #546: Fixed crash in InitPreBattleInterface()
- It seems the wrong 2nd parameter was passed to the method call InitPreBattleInterface(), when calling this method from from Dialogue Control.cpp (Line: 933)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-11 11:42:22 +00:00
Wanne 0c8aa89f08 - Bugfix: Disabled the experimental fix from Headrocks HAM 3.2, were enemies with 0 APs can enter the battle
o This experimental fix caused assertion errors in AddPossiblePendingMilitiaToBattle()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-11 10:39:47 +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
Wanne 73a10dceaf - Singleplayer: Fixed exploit, when it is enemies turn, you can still move when pressing CTRL + L or CTRL + S to open the Save/Load screen and then close the screen without loading/saving
o I just disabled loading/saving via the load/save screen when it is the enemies turn
o You can still save load via the quicksave slot

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-29 17:35:42 +00:00
Wanne 221bad1406 Multiplayer: Fixed exploit, where a client (which does not currently have the turn) can still move when pressing CTRL + L or CTRL + S to open the Save/Load screen and then close the screen without loading/saving
o I just disabled loading/saving while in turn based mode in a multiplayer game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-29 17:06:23 +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
Wanne f14fa1f66d BUGZILLA #537: Robot can now move through fire/gas tiles without stopping each tile. No need to stop each tile for the robot, because the robot does not get hurt by fire/gas.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-21 14:26:20 +00:00
Wanne 1252675d7e BUGZILLA #535: Fixed CTD that could occur every day on strategy screen at 08:58 when initializing the inventory for the arms dealer
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-21 13:18:58 +00:00
Wanne e51e7399e7 - Bugfix: Removed quest reward points for the WHOLE team after you won the boxing and impressed kingpin, because you gained too much experience if you do the boxing stuff again and again.
o Now we have vanilla behavior again.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4510 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-21 12:41:07 +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 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
Wanne 48a9816f6d - Fixed crash (could not load existing file) in Release version when initializing portrait icons
o  "VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE" was not set!


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4493 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-12 07:35:08 +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 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 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