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

Laptop/AimFacialIndex.cpp

@@ -11,6 +11,8 @@
 	#include "Soldier Profile.h"
 	#include "email.h"
 	#include "Text.h"
+	#include "aimsort.h"
+	#include "Assignments.h"
 #endif
 
 

Laptop/AimMembers.cpp

@@ -40,6 +40,10 @@
 	#include "Merc Contract.h"
 	#include "Strategic Merc Handler.h"
 	#include "Language Defines.h"
+	#include "Assignments.h"
+	#include "Sound Control.h"
+	#include "Quests.h"
+	#include "strategicmap.h"
 #endif
 
 #include "Strategic Town Loyalty.h"

Laptop/BobbyR.cpp

@@ -17,7 +17,10 @@
 	#include "Random.h"
 	#include "Text.h"
 	#include "Multi Language Graphic Utils.h"
-	#include "Utility.h"
+//	#include "Utility.h"
+	#include "armsdealerinvinit.h"
+	#include "GameSettings.h"
+	#include "message.h"
 #endif
 
 

Laptop/BobbyRGuns.cpp

@@ -18,6 +18,7 @@
 	#include "Overhead.h"
 	#include "Text.h"
 	#include "Weapons.h"
+	#include "GameSettings.h"
 #endif
 
 

Laptop/BobbyRMailOrder.cpp

@@ -19,9 +19,10 @@
 	#include "input.h"
 	#include "line.h"
 	#include "Text.h"
-	#include "Strategic.h"
 	#include "Campaign Types.h"
 	#include "Multi Language Graphic Utils.h"
+	#include "strategic.h"
+	#include "strategicmap.h"
 #endif
 
 

Laptop/BobbyRMailOrder.h

@@ -1,6 +1,7 @@
 #ifndef __BOBBYRMAILORDER_H
 #define __BOBBYRMAILORDER_H
 
+#include "LaptopSave.h"
 
 
 

Laptop/BobbyRShipments.cpp

@@ -4,6 +4,16 @@
 #else
 	#include "laptop.h"
 	#include "BobbyRShipments.h"
+	#include "bobbyr.h"
+	#include "utilities.h"
+	#include "WCheck.h"
+	#include "Text.h"
+	#include "BobbyRGuns.h"
+	#include "cursors.h"
+	#include "BobbyRMailOrder.h"
+	#include "wordwrap.h"
+	#include "strategic.h"
+	#include "strategicmap.h"
 #endif
 
 

Laptop/BrokenLink.cpp

@@ -2,7 +2,12 @@
 	#include "Laptop All.h"
 	#include "BrokenLink.h"
 #else
-
+	#include "Types.h"
+	#include "font.h"
+	#include "laptop.h"
+	#include "Font Control.h"
+	#include "Text.h"
+	#include "wordwrap.h"
 #endif
 
 #define		BROKEN_LINK__FONT									FONT12ARIAL

Laptop/CharProfile.cpp

@@ -24,6 +24,7 @@
 	#include "IMPVideoObjects.h"
 	#include "IMP Confirm.h"
 	#include "messageboxscreen.h"
+	#include "LaptopSave.h"
 #endif
 
 

Laptop/IMP Begin Screen.cpp

@@ -29,6 +29,7 @@
 	#include "strategic.h"
 	#include "Game Clock.h"
 	#include "text.h"
+	#include "LaptopSave.h"
 #endif
 
 #define FULL_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 138

Laptop/IMP Compile Character.cpp

@@ -33,6 +33,7 @@
 	#include "Soldier Profile.h"
 	#include "Animation Data.h"
 	#include "random.h"
+	#include "LaptopSave.h"
 #endif
 
 // how many times should a 'die' be rolled for skills of the same type?

Laptop/IMP Confirm.cpp

@@ -31,6 +31,8 @@
 	#include "Game Event Hook.h"
 	#include "LaptopSave.h"
 	#include "strategic.h"
+	#include "weapons.h"
+	#include "Random.h"
 #endif
 
 #define IMP_FILENAME_SUFFIX ".dat"

Laptop/IMP HomePage.cpp

@@ -20,6 +20,12 @@
 	#include "LaptopSave.h"
 	#include "line.h"
 	#include "english.h"
+	#include "Merc Hiring.h"
+	#include "Text.h"
+	#include "GameSettings.h"
+	#include "IMP MainPage.h"
+	#include "IMP Confirm.h"
+	#include "Game Clock.h"
 #endif
 
 void GetPlayerKeyBoardInputForIMPHomePage( void );

Laptop/IMP MainPage.cpp

@@ -21,6 +21,9 @@
 	#include "LaptopSave.h"
 	#include "IMP Compile Character.h"
 	#include "IMP Portraits.h"
+	#include "soldier profile type.h"
+	#include "GameSettings.h"
+	#include "Soldier Profile.h"
 #endif
 
 

Laptop/IMP Skill Trait.cpp

@@ -3,6 +3,22 @@
 	#include "IMP Skill Trait.h"
 	#include "_Ja25Englishtext.h"
 #else
+	#include "IMP Skill Trait.h"
+	#include "Button System.h"
+	#include "utilities.h"
+	#include "Debug.h"
+	#include "Text.h"
+	#include "Font Control.h"
+	#include "font.h"
+	#include "laptop.h"
+	#include "cursors.h"
+	#include "IMP MainPage.h"
+	#include "IMPVideoObjects.h"
+	#include "_Ja25EnglishText.h"
+	#include "wordwrap.h"
+	#include "CharProfile.h"
+	#include "soldier profile type.h"
+	#include "IMP Compile Character.h"
 #endif
 
 

Laptop/IMP Skill Trait.h

@@ -1,6 +1,8 @@
 #ifndef __IMP_SKILL_TRAIT__H_
 #define __IMP_SKILL_TRAIT__H_
 
+#include "Types.h"
+
 void EnterIMPSkillTrait( void );
 void RenderIMPSkillTrait( void );
 void ExitIMPSkillTrait( void );

Laptop/IMP Voices.cpp

@@ -19,6 +19,9 @@
 	#include "Sound Control.h"
 	#include "IMP Text System.h"
 	#include "text.h"
+	#include "soldier profile type.h"
+	#include "GameSettings.h"
+	#include "LaptopSave.h"
 #endif
 
 INT32 iCurrentVoice = 0;

Laptop/IMPVideoObjects.cpp

@@ -11,6 +11,8 @@
 	#include "cursors.h"
 	#include "IMP HomePage.h"
 	#include "laptop.h"
+	#include "Multi Language Graphic Utils.h"
+	#include "IMP Attribute Selection.h"
 #endif
 
 // globals 

Laptop/Store Inventory.cpp

@@ -8,6 +8,8 @@
 	#include "Debug.h"
 	#include "LaptopSave.h"
 	#include "ShopKeeper Interface.h"
+	#include "armsdealerinvinit.h"
+	#include "GameSettings.h"
 #endif
 
 

Laptop/email.cpp

@@ -19,6 +19,8 @@
 	#include "AimMembers.h"
 	#include "Random.h"
 	#include "Text.h"
+	#include "LaptopSave.h"
+	#include "finances.h"
 #endif
 
 //static EmailPtr pEmailList; 

Laptop/files.cpp

@@ -1,6 +1,7 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "Laptop All.h"
 #else
+	#include "builddefines.h"
 	#include <stdio.h>
 	#include "laptop.h"
 	#include "files.h"

Laptop/finances.cpp

@@ -15,6 +15,8 @@
 	#include "Text.h"
 	#include "Strategic Mines.h"
 	#include "LaptopSave.h"
+	#include "Campaign Types.h"
+	#include "strategicmap.h"
 #endif
 
 // the global defines

Laptop/florist Order Form.cpp

@@ -17,6 +17,8 @@
 	#include "Game clock.h"
 	#include "english.h"
 	#include "Text.h"
+	#include "LaptopSave.h"
+	#include "Random.h"
 #endif
 
 #include "meanwhile.h"

Laptop/history.cpp

@@ -15,6 +15,8 @@
 	#include "strategicmap.h"
 	#include "QuestText.h"
 	#include "text.h"
+	#include "message.h"
+	#include "LaptopSave.h"
 #endif
 
 

Laptop/insurance Contract.cpp

@@ -24,6 +24,7 @@
 	#include "Random.h"
 	#include "Strategic Status.h"
 	#include "Assignments.h"
+	#include "Map Screen Interface.h"
 #endif
 
 #define		INS_CTRCT_ORDER_GRID_WIDTH					132

Laptop/laptop.cpp

@@ -79,6 +79,11 @@
 	#include "Multi Language Graphic Utils.h"
 	#include "BrokenLink.h"
 	#include "BobbyRShipments.h"
+	#include "Dialogue Control.h"
+	#include "helpscreen.h"
+	#include "cheats.h"
+	#include "Strategic Status.h"
+	#include "Arms Dealer Init.h"
 #endif
 
 

Laptop/mercs Account.cpp

@@ -19,6 +19,7 @@
 	#include "LaptopSave.h"
 	#include "Text.h"
 	#include "Speck Quotes.h"
+	#include "Multi Language Graphic Utils.h"
 #endif
 
 #define		MERC_ACCOUNT_TEXT_FONT				FONT14ARIAL

Laptop/mercs Files.cpp

@@ -22,6 +22,11 @@
 	#include "LaptopSave.h"
 	#include "Text.h"
 	#include "Speck Quotes.h"
+	#include "Multi Language Graphic Utils.h"
+	#include "Quests.h"
+	#include "Assignments.h"
+	#include "Input.h"
+	#include "english.h"
 #endif
 
 #include "Cheats.h"

Laptop/mercs.cpp

@@ -23,6 +23,8 @@
 	#include "Speck Quotes.h"
 	#include "mercs Account.h"
 	#include "Soldier Profile.h"
+	#include "Game Event Hook.h"
+	#include "Quests.h"
 #endif
 
 #define		MERC_TEXT_FONT									FONT12ARIAL

Laptop/personnel.cpp

@@ -28,6 +28,9 @@
 	#include "Soldier Add.h"
 	#include "Interface Items.h"
 	#include "Weapons.h"
+	#include "strategicmap.h"
+	#include "GameSettings.h"
+	#include "Merc Contract.h"
 #endif
 
 #include "Soldier Macros.h"