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
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
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
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
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
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
lalien
60b6b85801
Strategic AI changes:
...
- Removed Omerta from the list of "unimportant" sectors (Estoni and San Mona still "unimportant")
- Allowed queen to attack Omerta before day 2 at 7:45AM and Drassen before day 3 at 6:30AM
- The reinforcements are not reassigned anymore when the sector where they were going to is captured by player
- Omerta garrison is not reassigned anymore when queen fortifies cities
- Enabled investigation of lost city sector by the enemy
*Limit for the investigation of the sector depends on difficulty level (4, 8, 12 and unlimited on INSANE)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-27 21:30:59 +00:00
AcyForsythe
d8ed7117f0
- Adding XML_Roaming.cpp to project
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@860 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-27 20:52:43 +00:00
AcyForsythe
f9fe75d5e7
- Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@857 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-25 22:45:10 +00:00
SpaceViking
0ca9624e95
Enable .ini setting to disable stealing
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@838 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-07 03:39:47 +00:00
lalien
1ef4419b0d
- Fixed misspelling of function names
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@822 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-01 10:37:34 +00:00
SpaceViking
060a09ead0
Code changes to allow more slots for IMPs.
...
Allow dead IMPs to be replaced.
Add another way to progress in the game (sectors visited).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@798 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-26 01:47:14 +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
Sergeant_Kolja
29052abd73
Fixed again more bugs which occurred when loading a 1.13 savegame which was saved under an older 1.13 build or under different XML-files. The bug is now better fixed than before.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@750 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-03 17:27:17 +00:00
Wanne
98f8fe6030
Correct wrong (some pixels) strategic map buttons alignment
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@739 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-24 19:55:01 +00:00
Sergeant_Kolja
e40b062672
fixed some crashes when loading 4xx built savegames. The game can continue, but You'll probably loose your vehicles. The Team in the Laptop/Personel also consist only of Your AVATAR, but in strategic map the team is complete.
...
This is not a very well finished fix. Only glued some NULL assigned pointers. I recomend to NOT load too old savegames.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@733 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-23 20:59:37 +00:00
Wanne
793bde64ee
- bugfix: CTD when Skyrider is escorted to his heli in drassen (before Skyrider talks to the mercs)
...
- changed: Location of the Heli information box in Strategy Screen in High Resolution
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-06 16:25:08 +00:00
Wanne
06a9541f24
Updated mapscreen.h and strategicmap.h (number of town, sams, ...) see revision 671
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@686 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-28 20:07:40 +00:00
Wanne
99b30d0c18
- bugfix: If queen retakes mine sector, player still gets income (money) from the mine although the "Daily Income" string on Strategic Screen is shown correctly.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@674 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 20:35:43 +00:00
Wanne
6760b2d177
Reverted save game breaking stuff for the purpose of bugfixing savegames. I will change them back before I build the new Release (This will be in one week)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@672 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 19:07:50 +00:00
Lesh
355f10fb18
- set max number of towns, town sectors and sam sites on strategic map to 50, 260 and 50 accordingly (saved game breaking stuff)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 17:08:26 +00:00
lalien
f96b4374f1
- new menu option: silent Skyrider
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-12 18:45:43 +00:00
Lesh
8008aa726d
- another memory leaking fix
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@659 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-08 13:47:27 +00:00
lalien
bcfa50e793
- The queen should try to get the cities back after they were liberated, just like the SAM's
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@654 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-05 21:13:43 +00:00
Lesh
f8b3f82cfc
- memory leaking killer pack
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-10 12:25:17 +00:00
Lesh
75f70a13e3
- added possibility to dismiss a vehicle without passengers
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-03 18:15:40 +00:00
Lesh
4a2a790b76
- bug fixing in the sam site externalization code
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@638 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-27 18:19:50 +00:00
Lesh
ff814b7fc7
- bug fix: secrets on strategic map and other externalized stuff were not properly initialized, if user loads a saved game before he creates a new game.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-18 19:16:58 +00:00
Wanne
0e8afa6c7a
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@634 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-15 21:10:38 +00:00
Lesh
0f2aad2850
- army externalization
...
- bugfix: proper sam site marking for Strategic AI
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-14 14:32:32 +00:00
Lesh
c0385017de
- made small optimization
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-11 22:23:27 +00:00
Lesh
ac91cfb731
- fixed CTD when trying to add 13th town
...
- preparations to increase number of town sectors
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-08 17:04:15 +00:00
Wanne
f839dcbe73
- bugfix: CTDs after you have placed your mercs before the attacking occurs
...
- added notification when you try to create a new IMP and you already have the maxium number of mercs (18) in your team.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-05 21:21:51 +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
AcyForsythe
75b16dbdee
- Added Wanne's Landmine bugfix
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@608 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-29 17:27:03 +00:00
Lesh
04913e8784
- debug code was removed
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@607 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-29 07:15:20 +00:00
Lesh
c1bddf1c9c
- provided code for:
...
1) changing max number of slots for towns (hardcoded value).
2) highest town index defines the number of towns on map (user defined value via xml).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@606 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-29 07:10:44 +00:00
Lesh
a2e54a2cd4
- updated cities.xml handling code so now it is possible to control can player train militia in town or not.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@604 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-23 19:13:58 +00:00
Lesh
02f666c2d8
-small fix that allows game to accept both capital and small letters as a y-coordinate of a sector in MovementCosts.xml
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@599 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-11 17:48:06 +00:00
Lesh
8b8ed96a6b
- reworked cities.xml handling section, added new fields
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@598 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-10 18:35:00 +00:00
Lesh
bd7e2c5b8f
- enabled town names in cities.xml
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-09 18:52:11 +00:00
AcyForsythe
50f6bb35ed
- Added options for delaying veteran militia training and mobile militia training. - Added cost modifiers to promoting green militia to regular and promoting regular to veteran.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@595 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-08 05:31:39 +00:00
AcyForsythe
d855a34473
- Added options to remove mercenary on-assignment deaths, and also set the number of deaths per difficulty level
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@594 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-07 03:40:02 +00:00
Lesh
5ccf99a069
- added sector variation (see "TableData\Map\AltSectors.xml")
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@591 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-04 16:24:46 +00:00
AcyForsythe
0c0f6eafad
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@589 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-02 09:12:31 +00:00
AcyForsythe
324e3c32db
- Cleaned up the militia code a bit, boolean logic at midnight with no coffee can be a little sloppy. Re-tested mobile militia/veteran militia changes.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-02 02:37:26 +00:00
AcyForsythe
11b2e75e32
- Added INI Setting and ability to manually train mobile militia at a cost
...
- Added INI setting and ability to train veteran militia
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@586 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-01 06:52:06 +00:00
Lesh
881ff0f5c2
- xml-files migration
...
- added Judge's movement costs externalization with minor tweaks
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@583 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-30 12:27:38 +00:00
AcyForsythe
6e966e7714
Got Editor Working Again... YAY!
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-29 21:08:22 +00:00