7604 Commits
Author SHA1 Message Date
Starwalker 88d8cf3616 forgot a BigItem pic (being of old age, and such...)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@831 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-21 11:47:12 +00:00
Starwalker 9df5df86bd Steyr Scout got built-in bipod and thus lost the ability to mount one as an attachment
Larger XM-8 guns got the ISM-V-IR as a defaut attachment
replaced pics of folding/retractable stock with new ones by Tbird
added last missing LBE item for inventory project (pics by Marlboro Man)
replaced a few LBE tileset pics (also by Marlboro Man)
corrected a few grammar/spelling mistakes in gun descriptions

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@830 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-21 11:45:59 +00:00
Wanne dc441a425d Added Overhaul's Lua lib to the project. Now it works without Lua51.dll
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-20 19:11:58 +00:00
Starwalker c604c92fe7 added more LBE items for the inventory guys (pics by Marlboro Man)
changed HEZI from assault rifle to rifle
replaced Metalstorm Surf Zone pic with a new one made by Tbird

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@829 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-19 06:16:43 +00:00
Starwalker 7c0772721f added Grippod and ISM-V sight (pics by Marlboro Man)
added 5 deactivated LBE-thingies for the inventory guys (pics by Marlboro Man)
replaced Makarov PM pic (Tbird again)
corrected NVG and Sungoggles boni and penalties (somehow they had become multiples of 8 instead multiples of 10)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@828 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-15 09:34:48 +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
SpaceViking ac41de3515 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@972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 03:01:57 +00:00
SpaceViking 2b59950880 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@971 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 03:00:15 +00:00
SpaceViking 1ff6f798c3 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@970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:57:50 +00:00
SpaceViking d24bb86686 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@969 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:57:16 +00:00
SpaceViking 183ee2005f 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@968 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:56:45 +00:00
SpaceViking 88b9b38bd6 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@967 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:56:15 +00:00
Starwalker 9bf393a7b8 replaced pics of Makarov PM and PMM, and Vis-35 with new pics by Tbird
added other pics for later use

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@824 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-14 12:38:35 +00:00
Wanne 4d51fbcdd9 PROJECT CHANGES (already done for VS 2003):
- Changed "Runtime Library" from "lua" project to "Multi-threaded Debug (/MTd)" so we get rid of "Linker Warning LNK4098" in project "ja2"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@940 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 19:42:03 +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
lalien e78b4ea242 - fix for Russian version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@934 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 15:47:03 +00:00
lalien 5299427465 - added project and lib files for Lua
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:58:34 +00:00
Wanne 74cd6a21f3 Reverted 2 lines in Tactical/ShopKeeper Interface.cpp, because it did not compile in VS 2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@932 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:44:36 +00:00
lalien 639987007d - renamed lib file
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:36:34 +00:00
Overhaul 611205b8f6 Corrected LUA console define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@928 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 08:48:01 +00:00
lalien 536f4ca51b - reverted some files from build 924
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 21:38:54 +00:00
SpaceViking 1c1f843449 Fixed error in copying soldier profiles
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@925 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 18:03:00 +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
SpaceViking 8ed1ff9d6e Fixes for array indexing problems when there are no best thrown/best gun
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@922 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 03:04:30 +00:00
Starwalker e505b01aa8 delete and replaced wrong LAR pics I
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@822 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-07 08:26:04 +00:00
Starwalker 6a7e44c9f4 replaced pics of SAR 21, RPK, LAR .45, and LAR .50 with new pics by Tbird
added HK 416 20", HK UCP, HEZI SM-1, and Rheinmetall MG3 (pics by Coolberg and Tbird)
added ammo for UCP and HEZI (pics by Coolberg)
added HK 417 pic for later use (Tbird)
changed Coolness on some ammo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@821 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-07 06:44:28 +00:00
lalien e5308f27b3 - externalized game starting time
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-04 18:01:51 +00:00
lalien 15fd8a17ee - Externalized game starting time
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@820 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-04 17:52:48 +00:00
Starwalker 438238500d deleted faulty entry from GermanItems.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@819 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-04 07:39:57 +00:00
Starwalker b5a8638585 Stupid me had marked the wrong folder for commitment on revision 817, so the INSAS and Minimi pics were missing. So again:
replaced pics of INSAS and Minimi with new ones made by Tbird!
replaced SMP1ITEMS.STI with one that ChrisL repaired, because there was one armor pic too much
allowed Rifle Suppressor on Galil Sniper
uploaded new GermanItems.xml from a new translator, had to correct and add a few things, though

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@818 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-02 15:28:29 +00:00
Starwalker c671823034 added HK 416 16" (more to follow), Owen SMG, and Galil Sniper
replaced pics of INSAS and Minimi with new ones made by Tbird

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@817 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-01 06:41:19 +00:00
Wanne eebe112427 new exe build (911)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@912 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-31 08:31:22 +00:00
Starwalker 4eb0b17d7d changed M1 Garand to .30-06 caliber
added Beretta M12, HK 416 10" (more to follow), and Steyr AUG-A3
added a lot of other gun pics for later use
replaced pics of Grach, M60E3, HK 416 14", Pecheneg, and Sterling L2A3
added a 40mm Grenade Panel
deleted wrong German descriptions of Thor's martial arts items

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@815 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-31 06:33:51 +00:00
lalien 76d67f37e9 - removed beta version build define
- allowed helicopter to land in enemy controlled sector
- SHIFT+N now can use goggles attached to the helmet

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-29 11:57:10 +00:00
Sergeant_Kolja 09a26e3155 in ReadInAttachmentComboMergeStats() added a missing fclose plus a missing XML_free
in Items.cpp added unfriendly code to trace + stop the game when pObj is corrupted.
(the corruption comes from somewhere outside the destructed foo!)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-27 12:34:43 +00:00
Wanne bd22863e45 - bugfix: If merc is in crouched stance and he passes an item to another merc, he did not change his direction
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-23 18:41:42 +00:00
Starwalker a45476d56c Somehow this pic got deleted during the last upload :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@814 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-23 13:53:59 +00:00
Starwalker 4c9bc82795 Coolberg improved his SIG pistol pics
added Tbird's SIG SAS pistols and his Luger pistol

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@813 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-23 13:49:13 +00:00
Wanne 4effa1c3ea - new: Merged source code of item throwing animation in crouched stance, AI was not changed (look for comments marked <SB>)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@890 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 18:09:15 +00:00
Wanne 855c66a42d - added the new item throwing animations in crouched stance
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@812 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-21 18:06:55 +00:00
Wanne d61f4ff935 - new exe build (888)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:59:40 +00:00
Wanne 34a683cacb - new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (Ja2_Options.INI Setting: USE_EXTERNALIZED_LOADSCREENS)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@810 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-21 14:32:11 +00:00
Wanne 76cf1684f1 - new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (INI-Switch: USE_EXTERNALIZED_LOADSCREENS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@887 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:29:52 +00:00
Starwalker b7a2705f3f corrected the non-transparent background of gun08.sti
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@809 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 15:48:50 +00:00
Starwalker 11b36e793d added a ton of armors: Thanks to ChrisL's work (both XML-work and graphics), we now can treat/coat the advanced armor items.
added a point of accuracy to hi-cap Colt pistol

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@808 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 14:47:43 +00:00
Starwalker 7f72bc8b7b added new armor graphics
added Galil Sniper pic (Coolberg)
added Luger and Steyr IWS 2000 pics (Tbird)
replaced Colt pistol pics with those made by Tbird
replaced AICW pic with one made by Tbird

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@807 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 14:40:52 +00:00
MaddMugsy d1f2c96949 -removed three references to "Nothing" items from Tony's Inventory (462, 468, 474). File re-indexed :)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@804 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-18 18:43:44 +00:00
SpaceViking 102bfd1469 Another missing entry
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@802 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-18 01:30:15 +00:00
SpaceViking a62ac737bd Add missing line back so Tony has full inventory.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@801 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-17 23:14:11 +00:00
Starwalker 5eecc32027 added new guns and magazines to Tony's inventory
added First Responder Kit to Howard's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@800 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-15 14:36:35 +00:00