Commit Graph
74 Commits
Author SHA1 Message Date
lalien 0c6b247cf5 - new shortcut: Shift+M moves all items in sector to location of selected merc
- fix for array initialization


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-13 23:32:44 +00:00
Overhaul d8145755c3 Added window around windowed JA2
Replaced Windows console with freeware console implementation.  Activate in windowed mode with \
Added error and quit if JA2 started in window mode in >16bpp color depth
Fix to enemy sector investigation:  Was deducting from redshirts when elites investigated
Fix AWOL militia (need additional fix to prevent them from being redistributed during after reinforcements)
Fix to tanks to add them in their original spot when a new one cannot be found.  Should modify to remove old wreckage in this case.
AI no longer tries to fire mortar when no room for it
Tanks no longer try to throw knives


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-08 07:02:56 +00:00
Overhaul e6024e5151 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2007-06-29 10:40:05 +00:00
SpaceViking 2cd3521e3f Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 03:05:04 +00:00
Wanne df9d9e6c00 PROJECT CHANGES (already done for VS 2003):
- Added "lua" project folder to the "Additional Include Directories" for each project
- Added "lua51_vs2003.lib" to the "Additional Dependencies" for project "ja2" 
Project should now compile in VS 2003 without any errors.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 18:48:46 +00:00
Overhaul 7a27e7105d New attack busy system
Added missing #includes

Added LUA scripting and console

Changed the way tracers are visualized, so they work more like real tracers instead of a light fountain

Fixed signedness of many grid variables used in GetMouseMapPos calls

Fixed enemy weapon choosing:  Sometimes a mortar is chosen but later rejected, but the grenade class was not reset.  Caused assertion failure

Added checks so enemies don't try to chuck RPG grenades with their hands

Now possible to shoot a someone in the head if he's in water

Fixed InitSightArrays to also clear soldier interrupt duel points.  This was causing an assertion failure elsewhere in the code because the interrupt list still had soldiers on it sometimes when this function was called.

Soldiers are much less willing to forfeit their turn over an attempt to use more APs than they have

Removed early setting of muzzle flash.  This would allow enemies to get an interrupt before you even fired.

Fixed item dropping by AI.  If AI tried to drop something while standing it would cause deadlock

Change to greatly speed up closing the sector inventory window in an unloaded sector

Added conditional compile flag to always give robot weapon ready advantage, even for 360 degree sighting


Check builddefines.h for the conditional flags.  Of greatest interest might be LUA_CONSOLE.  This will cause the game to bring up a command console when run.  However this console is severely lacking in many areas.  If anybody knows of an open-source terminal/console that could be used instead, it would be appreciated.  The existing console does bad things when you try to close it, and since it counts as a separate app, it pauses the game while it has focus.

LUA scripting is very limited, basically just proof of concept.  There is one global variable, the Soldiers array.  An array index gives you the soldier in that slot in the currently loaded sector.  The soldier has a few things that can be accessed:  name (short name); fullname (long name); grid (current grid #, can be changed); walkto(grid) (function to walk to another grid); runto(grid) (function to run to another grid)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@924 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 09:01:04 +00:00
Wanne 2ee08ea1c0 - bugfix: Automated scrolling if you talk to someone in small maps (e.g: Rebel Basement) in high resolution (1024x768)
- bugfix: Scrolling problem in radar map in small maps (e.g: Rebel Basement) in high resolution (1024x768)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-14 16:07:06 +00:00
lalien 0530b53b9c bug fixes from Overhaul:
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 13:16:37 +00:00
lalien 61d6152ce5 bug fixes from Overhaul:
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check
- Fixed improper printf field in a debug message 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 22:44:08 +00:00
lalien 8e80a6168a bug fixes from Overhaul:
- roof inaccessible tiles problem
- AI hang while deciding on an action (fire 0 rounds on auto)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 15:10:29 +00:00
lalien 30cc546c09 bug fixes from Overhaul:
- CTD when someone fell off the west side of a building 
- Assertion failure when Skyrider leaves a sector where a merc cannot be woken up 
- Boxing fixes: Opponent no longer "seeks cover", ie jumps back out of the ring; no longer will pick up a gun from the ground while boxing
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 14:42:28 +00:00
Wanne 91016c3d6c - reverted: Reverted the changes from version 856, because I think this leads to the graphical glitches with tooltips in Strategy screen. But I'm not sure if it is the problem ...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@864 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-28 20:03:41 +00:00
Wanne a5dd7f7a76 - bugfix: Wrong placement of the terrorists pictures on the files section in the laptop
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@856 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-19 20:11:06 +00:00
lalien 3f37673034 - added VS2005 compability fix from Space Viking
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-10 18:46:57 +00:00
Wanne 7a1987665d - bugfix: Ira invisible bug in rebel basement
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@652 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-31 12:06:35 +00:00
Lesh e1d8f249e3 - sam sites externalization
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@612 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-31 20:22:19 +00:00
Wanne 2169585abb - bugfix: Removed the serious bug that was added in exe build 568
- feature: Re-enabled auto save (USE_AUTO_SAVE in ja2_options.ini)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@576 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-28 15:23:45 +00:00
AcyForsythe c816092c05 Added INI option to stop thunderstorms and still alow rain
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@570 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-27 22:59:34 +00:00
Wanne b3e4aa8305 - bugfix: CtH calculation (shows up nearly 0% next to an enemy), when mercs spots an enemy after climbing up/down a rooftop
- bugfix: Added Pulmu's weight calculation fix

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-26 19:17:09 +00:00
Lesh 236e26fe8a - debug logging was removed, I forgot about this
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@556 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-24 08:02:26 +00:00
AcyForsythe 050ae16d3b Adding VC6 compatibility
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-23 19:42:41 +00:00
Wanne bea62be616 - bugfix: The content of all the IMP analyze emails only show the statistics of last created character
- removed some of my old unused comments

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-17 13:51:20 +00:00
Lesh e449942dc2 - second code patch from Brent Johnson (Nonomori), aimed at source compatibility with VS.NET 2005
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@520 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-10 10:26:43 +00:00
Lesh 6df124efd7 - code cleanup mostly from Brent Johnson (Nonomori), a very few from me
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-06 19:10:08 +00:00
Lesh 944df34a9e - main flashbang code added
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@462 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-23 15:28:55 +00:00
Lesh eef9f7309d - lighting fix: instant on/off of the light sprite is working now
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-23 15:25:47 +00:00
MaddMugsy b2355272b8 -fixed breaklights not working in Drassen Mine sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@453 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-18 01:14:49 +00:00
Lesh 4afc299b60 - this patch allow proper loading map versions of 5.0, 5.25 and 6.0. existing mods friendly.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-16 13:40:20 +00:00
lalien 86c2197665 - added menu option to allow/disallow crows
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@404 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-04 18:44:46 +00:00
MaddMugsy 13a8319fbb -ammo weights affected by # bullets remaining
-added code to support urban, desert and snow camo

2 issues:

1. Need to test this to make sure it works, since I'm at work.  I'll test it all out tonight.

2. There is no Snow terrain type.  Anyone have any great ideas on how to test for it?

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-03 23:55:44 +00:00
lalien bba67c2082 - bug fix: Win 98 CTD
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@381 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-29 22:27:48 +00:00
lalien 404b1ff4da - fixed the bug fix from build 365: Smoke grenade has the same effect as mustard gas grenade (need to run in gas cloud to reproduce)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-22 20:10:55 +00:00
lalien 822f29ad76 - bug fix: Smoke grenade has the same effect as mustard gas grenade (need to run in gas cloud to reproduce)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@365 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-21 23:33:57 +00:00
Wanne b6df04a08a Rain noise can be toggled ON/OFF in the Options Screen
Added Brightness Level string to the German Version, when pressing "F" in tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-21 21:09:50 +00:00
lalien 1700e00c06 - fix for HE ammo
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@347 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-16 18:30:37 +00:00
lalien a351a03d0c - fixed crash in InternalIgniteExplosion, will disable HE ammo
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-14 19:37:08 +00:00
lalien 5abf2dd62f - bug fix for merc screen position in tactical on high resolution
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-10 19:09:02 +00:00
MaddMugsy 7731b74109 -added callahan's fix for HE ammo not exploding
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-10 02:51:15 +00:00
Lesh 645598f3d5 good news - i fixed nasty freeze with throwing items through window. make your tests again.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-02 20:02:39 +00:00
Wanne 37ef9ad38a - Made some minor cosmetical changes to the Tactical Placement Screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-01 17:45:13 +00:00
Wanne 5ad73ef703 bugfix:
- Placement cursor was shown valid (should not be valid), when it was inside the shade area near to the valid area.
- Removed the "flicker" that sometimes appeared on the Tactical Placement screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-30 21:25:37 +00:00
MaddMugsy df50c0e606 -added explosive ammo code from Callahan
-disabled tracer light effects on rooftops, since lights don't work on roofs yet

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@303 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-26 16:12:05 +00:00
lalien e10a9b3558 - damage radius fixed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-20 21:17:51 +00:00
lalien 99a0c3db6f - fixed explosion/stun damage multiplier
- enabled strategic event NPC_ACTION_SEND_SOLDIERS_TO_BATTLE_LOCATION


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-20 16:42:32 +00:00
MaddMugsy d9f049de49 -fixed stun grenade dmg
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-19 23:11:10 +00:00
lalien 73e9e42dce - increased max size of visible range and cover display
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-11 12:42:54 +00:00
MaddMugsy ac420d7f24 -optimized the sight handling code for tracers so that it doesn't run for every tile crossed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-10 20:21:14 +00:00
MaddMugsy 008e216b17 -added underslung/attached GLs to AI inventory and enabled AI to use them :)
-rewrote the AI sniper code to take advantage of readying weapons.  Added new SNIPER order for soldiers that's assigned when a soldier has a sniper rifle (80% chance) or a scope (40% chance).
-spreadsheet update

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-10 07:22:16 +00:00
MaddMugsy df685592e0 -put back the INT8 bType
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@214 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-09 15:36:42 +00:00
MaddMugsy 6c9771eef0 -minor lighting fix
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-09 06:06:16 +00:00