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
This commit is contained in:
Overhaul
2007-06-09 09:01:04 +00:00
parent 8ed1ff9d6e
commit 7a27e7105d
275 changed files with 25107 additions and 20463 deletions
+12 -7
View File
@@ -31,6 +31,8 @@
#include "text.h"
#include "Morale.h"
#include "Map screen helicopter.h"
#include "structure wrap.h"
#include "meanwhile.h"
#endif
#define SCRIPT_DELAY 10
@@ -548,7 +550,7 @@ void AirRaidLookForDive( )
if ( giNumGridNosMovedThisTurn == 0 )
{
// Free up attacker...
FreeUpAttacker( gpRaidSoldier->ubID );
ReduceAttackBusyCount( );
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Tried to free up attacker AIR RAID NO DIVE, attack count now %d", gTacticalStatus.ubAttackBusyCount) );
}
}
@@ -643,6 +645,7 @@ void BeginDive( )
// Increment attacker bust count....
gTacticalStatus.ubAttackBusyCount++;
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Starting attack BEGIN DIVE %d", gTacticalStatus.ubAttackBusyCount) );
DebugAttackBusy( String("!!!!!!! Starting attack BEGIN DIVE %d", gTacticalStatus.ubAttackBusyCount) );
// Pick location...
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("BeginDive: pick location"));
@@ -822,7 +825,7 @@ void DoDive( )
//DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Starting attack AIR RAID ( fire gun ), attack count now %d", gTacticalStatus.ubAttackBusyCount) );
// INcrement bullet fired...
gpRaidSoldier->bBulletsLeft++;
// gpRaidSoldier->bBulletsLeft++;
}
// For now use first position....
@@ -857,7 +860,7 @@ void DoDive( )
//DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Starting attack AIR RAID ( second one ), attack count now %d", gTacticalStatus.ubAttackBusyCount) );
// INcrement bullet fired...
gpRaidSoldier->bBulletsLeft++;
// gpRaidSoldier->bBulletsLeft++;
}
@@ -872,7 +875,7 @@ void DoDive( )
if ( ( gTacticalStatus.uiFlags & INCOMBAT ) )
{
// Free up attacker...
FreeUpAttacker( gpRaidSoldier->ubID );
ReduceAttackBusyCount( );
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Tried to free up attacker AIR RAID DIVE DONE FOR THIS TURN, attack count now %d", gTacticalStatus.ubAttackBusyCount) );
}
}
@@ -999,6 +1002,7 @@ void DoBombing( )
// Increase attacker busy...
gTacticalStatus.ubAttackBusyCount++;
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Starting attack AIR RAID ( bombs away ), attack count now %d", gTacticalStatus.ubAttackBusyCount) );
DebugAttackBusy( String("!!!!!!! Starting attack AIR RAID ( bombs away ), attack count now %d", gTacticalStatus.ubAttackBusyCount) );
}
// Drop bombs...
@@ -1013,7 +1017,7 @@ void DoBombing( )
if ( ( gTacticalStatus.uiFlags & INCOMBAT ) )
{
// Free up attacker...
FreeUpAttacker( gpRaidSoldier->ubID );
ReduceAttackBusyCount( );
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Tried to free up attacker AIR RAID BOMB ATTACK DONE FOR THIS TURN, attack count now %d", gTacticalStatus.ubAttackBusyCount) );
}
}
@@ -1192,7 +1196,7 @@ void HandleAirRaid( )
if ( ( gTacticalStatus.uiFlags & INCOMBAT ) )
{
// Free up attacker...
FreeUpAttacker( gpRaidSoldier->ubID );
ReduceAttackBusyCount( );
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Tried to free up attacker AIR RAID ENDING DIVE, attack count now %d", gTacticalStatus.ubAttackBusyCount) );
}
@@ -1207,7 +1211,7 @@ void HandleAirRaid( )
if ( ( gTacticalStatus.uiFlags & INCOMBAT ) )
{
// Free up attacker...
FreeUpAttacker( gpRaidSoldier->ubID );
ReduceAttackBusyCount( );
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Tried to free up attacker AIR RAID ENDING DIVE, attack count now %d", gTacticalStatus.ubAttackBusyCount) );
}
@@ -1279,6 +1283,7 @@ BOOLEAN HandleAirRaidEndTurn( UINT8 ubTeam )
// Increment attacker bust count....
gTacticalStatus.ubAttackBusyCount++;
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("!!!!!!! Starting attack AIR RAID, attack count now %d", gTacticalStatus.ubAttackBusyCount) );
DebugAttackBusy( String("!!!!!!! Starting attack AIR RAID, attack count now %d\n", gTacticalStatus.ubAttackBusyCount) );
AddTopMessage( AIR_RAID_TURN_MESSAGE, TacticalStr[ AIR_RAID_TURN_STR ] );