UINT32 ubMeleeDamageMultiplier;

//Ar1z: Range multiplier/Divider
	INT16 iGunRangeMultiplier;

 gGameExternalOptions.ubGunDamageMultiplier = iniReader.ReadInteger("JA2 Gameplay Settings","GUN_DAMAGE_MULTIPLIER",0);

	//Ar1z: Range multiplier/Divider
 gGameExternalOptions.iGunRangeMultiplier = iniReader.ReadInteger("JA2 Gameplay settings","GUN_RANGE_MULTIPLIER",100);
if (gGameExternalOptions.iGunRangeMultiplier == 0)
{
	gGameExternalOptions.iGunRangeMultiplier = 100;
}

pData->curWeapon.usRange = (UINT16) atol(pData->szCharData);

//Ar1z: Range multiplier/Divider

if (gGameExternalOptions.iGunRangeMultiplier < 0)
{
pData->curWeapon.usRange /= (gGameExternalOptions.iGunRangeMultiplier * -1) / 100;
}
else
{
pData->curWeapon.usRange *= gGameExternalOptions.iGunRangeMultiplier / 100;
}

//***************************************************************************
Overhead.cpp
void ExitCombatMode( )
...
EndTopMessage( );

+ ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Exit combat mode");//arynn adds forced turn mode

// OK, we have exited combat mode.....
...

BOOLEAN CheckForEndOfCombatMode( BOOLEAN fIncrementTurnsNotSeen )
...
// If we have reach a point where a cons. number of turns gone by....
- if ( gTacticalStatus.bConsNumTurnsNotSeen > 1 )
+ if ( gTacticalStatus.bConsNumTurnsNotSeen > 1 && !gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ])//arynn adds forced turn mode
{
//***************************************************************************
Soldier Add.cpp
void AddSoldierToSectorGridNo( SOLDIERTYPE *pSoldier, INT16 sGridNo, UINT8 ubDirection, BOOLEAN fUseAnimation, UINT16 usAnimState, UINT16 usAnimCode )
...
if ( pSoldier->ubBodyType != BLOODCAT )
{
SetEnemyPresence( );
+ //arynn adds forced turn mode START *note not for bloodcats..
+ if ( gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ])
+ {
+ ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Forced Turn Mode Active, Entering Combat" );
+ EnterCombatMode( OUR_TEAM );
+ }//arynn adds forced turn mode END
}
//***************************************************************************
Turn Based Input.cpp
void TeleportSelectedSoldier();
+void ToggleTurnMode();//arynn adds forced turn mode
void ToggleTreeTops();
...
void GetKeyboardInput( UINT32 *puiNewEvent )
...
else
ToggleTreeTops();
break;

+ case 'T'://arynn adds forced turn mode
+ if ( fAlt && fCtrl && fShift)
+ {
+ ToggleTurnMode();
+ }

case '=':
...
void TeleportSelectedSoldier()
...
+void ToggleTurnMode()//arynn adds forced turn mode
+{
+ if ( !gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] )
+ {
+ ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Forced Turn Mode" );
+ gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] = TRUE;
+ EnterCombatMode( OUR_TEAM );
+ }
+ else
+ {
+ ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Normal turn mode");
+ gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] = FALSE;
+ }
+}

void ToggleTreeTops()

//***************************************************************************
_EnglishText.cpp

L"Low CPU usage",
+ L"Forced Turn Mode", //arynn adds forced turn mode

};
...
L"When ON, game will run with much lower CPU usage.",
+ L"When ON and enemy present, Turn Base mode persists untill sector is free. \"cntrl+alt+shft+t\"",//arynn adds forced turn mode

};

//***************************************************************************
GameSettings.cpp
gGameSettings.fOptions[ TOPTION_LOW_CPU_USAGE ] = FALSE;
+ gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] = FALSE; //arynn adds forced turn mode

gGameSettings.ubSizeOfDisplayCover = 4;
...
TOPTION_LOW_CPU_USAGE,
+ TOPTION_TOGGLE_TURN_MODE, //arynn adds forced turn mode

NUM_GAME_OPTIONS, //Toggle up this will be able to be Toggled by the player

merc A B C D E F
wearing nvg sg sg nvg nvg sg
helmet attach sg nvg none none none none
inventory none none nvg sg none none

post shift-n, now wearing :

old sg nvg nvg sg nvg sg
new sg sg sg sg nvg sg
future? sg sg sg sg none sg

void GetKeyboardInput( UINT32 *puiNewEvent )
...



case 'N':
{
/* CHRISL - Adjusted this option to allow the game to search through Helmet attachments
as well as inventory positions. */
//arynn toggle night vision/sun vision fix
//arynn comments toggle night vision/sun vision to best able interpertation (educational purpose mostly)
//old way = mercA has sun, mercB has nightvision, shift-n, mercA now has night and mercB has sun
//new way = mercA has sun, mercB has night, shift-n, now mercA has night and mercB has night, game reports night vision mode,shift-n again, both have sun goggle report sun vision mode
SOLDIERTYPE *pTeamSoldier; // temp pointer for merc
OBJECTTYPE * pObj; // helmet object pointer, used in locating attached sun/night vision item
INT8 bLoop, bSlot1, bSlot2, bSlot3, temp, tempStatus=0; // index to merc (counter), index to headslot, index to obj in general inv, index to obj attched to helmet, temp postion that has target obj, temp holer for target obj status
INT16 lastBonus=0, tempItem=0; // lastbonus to compare for the better target boject, tempitem for swapping target obj with face object
+ INT8 first_squadmate_found=0, toggle_vision_mode=0; //arynn adds flags to determine first toggle type for others to follow/ignore swap command
for (bLoop=gTacticalStatus.Team[gbPlayerNum].bFirstID, pTeamSoldier=MercPtrs[bLoop]; bLoop <= gTacticalStatus.Team[gbPlayerNum].bLastID; bLoop++, pTeamSoldier++)
{
//loop thru entire team
if ( OK_CONTROLLABLE_MERC( pTeamSoldier ) && pTeamSoldier->bAssignment == CurrentSquad( ) && !AM_A_ROBOT( pTeamSoldier ) )
{
//entry here pTeamSoldier is_a merc and in selected squad and is not a robot
+ if(!first_squadmate_found) { first_squadmate_found++; };//arynn adds found first squad mate upgrade to stage 1

for (bSlot1 = HEAD1POS; bSlot1 <= HEAD2POS; bSlot1++)
{
//loop thru 2 head slots
if ( Item[pTeamSoldier->inv[bSlot1].usItem].brightlightvisionrangebonus > 0 )
{
+ if(first_squadmate_found==1) { toggle_vision_mode=1;}; //arynn adds found mode
+ if(first_squadmate_found==1) { first_squadmate_found++;} //arynn adds test if first squad mate and upgrade stage, then continue past else if check for break
+ else if (toggle_vision_mode != 1) {break;} //arynn adds its not the first squad mate, if its not same mode then break and dont swap

//entry here is: item found with sun goggle vision bonus (hopefully only one night vision object per both head slots?)
lastBonus=0; //re-initialize bonus for comparing best bonus object
bSlot2 = ITEM_NOT_FOUND; //re-initialize target object locator for general inventory variant
bSlot3 = ITEM_NOT_FOUND; //re-initialize target object locator for helmet attachment variant
temp = 0; //re-initalize general inventory position
pObj = &(pTeamSoldier->inv[HELMETPOS]);//set object pointer to address of helmet for locating potentially attached target object
while (temp != ITEM_NOT_FOUND)
{
temp = FindNightGoggles( pTeamSoldier, lastBonus );//call seeks thru inventory for best nightvision bonus oject that fits in headpos slots
if ( temp > ITEM_NOT_FOUND )
{
//entry here item has been found in general inventory that is_a night vision item for headpostion
lastBonus = Item[pTeamSoldier->inv[temp].usItem].nightvisionrangebonus; //sets bonus of found object for compare to helmet attached object
bSlot2 = temp; //set index to slot of best nightvision obj for face found
}
//else lastbonus and bslot remain as initialized, nightvision goggle not found in general inventory
}
for (int i = 0; i < MAX_ATTACHMENTS; i++)
{
//loop thru attachment to helmet object
if ( Item[ pObj->usAttachItem[i] ].nightvisionrangebonus > lastBonus && Item[ pObj->usAttachItem[i] ].usItemClass == IC_FACE )
{
//entry here is_a better nightvision object, and it fits in headposition
bSlot2 = ITEM_NOT_FOUND; //a better night vision object is attached, forget general inventory variant
bSlot3 = i; //attachment slot index of target object
lastBonus = Item[ pObj->usAttachItem[i] ].nightvisionrangebonus;//best night vision bonus reset for comparision ? multiple attached night vision objects ?
}
}
if ( bSlot3 != ITEM_NOT_FOUND )
{
//entry here is: item found as an attachment to the helmet object special case for swapping
// Duplicate item in helmet attachment slot
tempItem = pObj->usAttachItem[bSlot3]; //arynn uncertainty : a simple INT16 handles an object's entire dataset ?
//arynn uncertainty : in my experience, such a swap involves an algorithm such as:
//arynn uncertainty : OBJ temp, 1, 2; temp=1; 1=2; 2=temp;
tempStatus = pObj->bAttachStatus[bSlot3]; //arynn uncertainty : status ? as in condition ? or flag as an attached object ?
// Replace helmet attachment with face slot
pObj->usAttachItem[bSlot3] = pTeamSoldier->inv[bSlot1].usItem;
pObj->bAttachStatus[bSlot3] = pTeamSoldier->inv[bSlot1].ItemData.Generic.bStatus[0];
// Replace face slot with helmet attachment from temp
pTeamSoldier->inv[bSlot1].usItem = tempItem;
pTeamSoldier->inv[bSlot1].ItemData.Generic.bStatus[0] = tempStatus;
}
else if ( bSlot2 != ITEM_NOT_FOUND )
{
//entry here is: item found in general inventory, special function exists to handle swap
SwapObjs( pTeamSoldier, bSlot1, bSlot2, TRUE );//call swaps objects for soldier within basic inventory
}
break;//break here because operation has been completed, item found and swapped or not
}//end if wearing sun vision object - find night vision and swap
//following block is same as above except inverted towards currently wear nightvision and locating-swapping sun vision
else if(Item[pTeamSoldier->inv[bSlot1].usItem].nightvisionrangebonus > 0)
{

+ if(first_squadmate_found==1) { toggle_vision_mode=2;}; //arynn adds found mode
+ if(first_squadmate_found==1) { first_squadmate_found++;} //arynn adds test if first squad mate and upgrade stage, then continue past else if check for break
+ else if (toggle_vision_mode != 2) {break;} //arynn adds its not the first squad mate, if its not same mode then break and dont swap

lastBonus=0;
bSlot2 = ITEM_NOT_FOUND;
bSlot3 = ITEM_NOT_FOUND;
temp = 0;
pObj = &(pTeamSoldier->inv[HELMETPOS]);
while (temp != ITEM_NOT_FOUND)
{
temp = FindSunGoggles( pTeamSoldier, lastBonus );
if ( temp > ITEM_NOT_FOUND )
{
lastBonus = Item[pTeamSoldier->inv[temp].usItem].brightlightvisionrangebonus;
bSlot2 = temp;
}
}
for (int i = 0; i < MAX_ATTACHMENTS; i++)
{
if ( Item[ pObj->usAttachItem[i] ].brightlightvisionrangebonus > lastBonus && Item[ pObj->usAttachItem[i] ].usItemClass == IC_FACE )
{
bSlot2 = ITEM_NOT_FOUND;
bSlot3 = i;
lastBonus = Item[ pObj->usAttachItem[i] ].brightlightvisionrangebonus;
}
}
if ( bSlot3 != ITEM_NOT_FOUND )
{
// Duplicate item in helmet attachment slot
tempItem = pObj->usAttachItem[bSlot3];
tempStatus = pObj->bAttachStatus[bSlot3];
// Replace helmet attachment with face slot
pObj->usAttachItem[bSlot3] = pTeamSoldier->inv[bSlot1].usItem;
pObj->bAttachStatus[bSlot3] = pTeamSoldier->inv[bSlot1].ItemData.Generic.bStatus[0];
// Replace face slot with helmet attachment from temp
pTeamSoldier->inv[bSlot1].usItem = tempItem;
pTeamSoldier->inv[bSlot1].ItemData.Generic.bStatus[0] = tempStatus;
}
else if ( bSlot2 != ITEM_NOT_FOUND )
{
SwapObjs( pTeamSoldier, bSlot1, bSlot2, TRUE );
}
break;
}
}


fCharacterInfoPanelDirty = TRUE;
fInterfacePanelDirty = DIRTYLEVEL2;
DeleteSoldierLight( pTeamSoldier );
PositionSoldierLight( pTeamSoldier );
}
}
+ if(toggle_vision_mode == 0) {ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Nothing happened.");}
+ if(toggle_vision_mode == 1) {ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Squad set for night vision.");}
+ if(toggle_vision_mode == 2) {ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Squad set for sun goggles.");}

/* CHRISL - Adjusted this option to allow the game to search through Helmet attachments
as well as inventory positions. */
}
break;

Quote:

//Ar1z: Range multiplier/Divider

if (gGameExternalOptions.iGunRangeMultiplier < 0)
{
pData->curWeapon.usRange /= (gGameExternalOptions.iGunRangeMultiplier * -1) / 100;
}
else
{
pData->curWeapon.usRange *= gGameExternalOptions.iGunRangeMultiplier / 100;
}

Also you need to add the following into JA_OPTIONS.INI after GUN_DAMAGE_MULTIPLIER
; This is later divided by 100) if negative value it will perform division e.g. 200 = range x2, -150 = range /1.5
; ranges 1-99 should not be used. only use if you know what you are doing
GUN_RANGE_MULTIPLIER = 150

• (-150 * -1) / 100 is 1 (and not two thirds of the range as you suggested)
• 199 / 100 is 1
• everything between -99 and -1 leads to a division by zero ((-50 * -1) / 100 is 0)
• everything between 1 and 99 results in a range of 0 (50 / 100 is 0).

UINT16& range = pData->curWeapon.usRange;
range = range * gGameExternalOptions.iGunRangeMultiplier / 100;

BTW: drop this nonsensical hungarian notation stuff.

Everyday you learn something new

OK! what should I do for 150/100=1,5 instead of 1? typecasting with float?

Quote:

BTW: drop this nonsensical hungarian notation stuff.

what do you mean by that?

All AI.h

#include "Queen Command.h"
+#include "cheats.h"
#include "Lighting.h"


Tactical All.h

#include "XML.h"
+#include "Lua Interpreter.h"

Lua.cpp
// Set up the game info
- LuaTacticalSetup( L);
- LuaStrategicSetup( L);
- LuaEnvironmentSetup( L);
+// LuaTacticalSetup( L);
+// LuaStrategicSetup( L);
+// LuaEnvironmentSetup( L);

Overhead.cpp

void ExitCombatMode( )
{
...
if ( pSoldier->flags.fNoAPToFinishMove && pSoldier->stats.bLife >= OKLIFE )
{
pSoldier->AdjustNoAPToFinishMove( FALSE );
+
+ //arynn fix lower ready weapons
+ //previously "ready weapon" state was being dropped in a couple of cases
+ //the fix involves bypassing the reset animation state for the various "ready weapon" types
+ //since this is a reset animation function, we should be VERY specific about when and what we dont reset
+
+ UINT16 test;
+ test = pSoldier->usAnimState;
+ if (!( test == AIM_RIFLE_STAND || test == AIM_RIFLE_CROUCH ||
+ test == AIM_RIFLE_PRONE || test == AIM_DUAL_STAND ||
+ test == AIM_DUAL_CROUCH || test == AIM_DUAL_PRONE
+ ))
+ {
pSoldier->SoldierGotoStationaryStance( );
+ }//arynn fix lower ready weapon end_if


;**************************************************

HanldeUI.cpp

BOOLEAN MakeSoldierTurn( SOLDIERTYPE *pSoldier, INT16 sXPos, INT16 sYPos )
{
...

// ATE: make stationary if...
if ( pSoldier->flags.fNoAPToFinishMove )
{
+ //arynn fix lower ready weapons
+ //previously "ready weapon" state was being dropped in a couple of cases
+ //the fix involves bypassing the reset animation state for the various "ready weapon" types
+ //since this is a reset animation function, we should be VERY specific about when and what we dont reset
+ UINT16 test;
+ test = pSoldier->usAnimState;
+ if (!( test == AIM_RIFLE_STAND || test == AIM_RIFLE_CROUCH ||
+ test == AIM_RIFLE_PRONE || test == AIM_DUAL_STAND ||
+ test == AIM_DUAL_CROUCH || test == AIM_DUAL_PRONE
+ ))
+ {
pSoldier->SoldierGotoStationaryStance( );
+ }//arynn fix lower ready weapon end_if
}

Handle UI.cpp

UINT32 UIHandleCMoveMerc( UI_EVENT *pUIEvent )
{
- pSoldier->InternalSoldierReadyWeapon( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );
+ pSoldier->InternalDoMercBattleSound( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );
...

void EndMultiSoldierSelection( BOOLEAN fAcknowledge )
{
- pSoldier->InternalSoldierReadyWeapon( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );
+ pSoldier->InternalDoMercBattleSound( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );
...
BOOLEAN HandleMultiSelectionMove( INT16 sDestGridNo )
{
- pSoldier->InternalSoldierReadyWeapon( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );
+ pSoldier->InternalDoMercBattleSound( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );

well, i could only do a debug build. im using visual studio 2008 professionel and i get 2 errors when trying to build a release. maybe someone can help. here is the error:

SignTool Error: IStore2::Load returned error: 0x80070003
SignTool Error: An error occurred while attempting to load the signing
certificate from: c:\documents and settings\paul\ja2.spc
Project : error PRJ0019: A tool returned an error code from "Signing the code"

Situations :
given: | A B C D E F G H I J K L
wearing | N S S N N S - - - - - Gas/Ear
in helmet | S N - - - - S N - - - N
inventory | - - N S - - - - S N - S
after shift-n
wearing:
old way | S N N S N S - - - - - Gas/Ear
new way | S S S S - S S - S - - Gas/Ear
shift-n again:
old way | N S S S N S - - - - - Gas/Ear
new way | N N N N N - - N - N - Gas/Ear

void SwapGoggles()
{
// CHRISL - Adjusted this option to allow the game to search through Helmet attachments as well as inventory positions.

//Arynn toggle night vision/sun vision improvement
//idealology : this is the ("i need to be wearing this" || "i need to stop stop wearing this" (NVG/SVG)) squad-level macro (vs. SIRT's un-friendly manual by-hand method)
//old way = mercA has sun, mercB has nightvision, shift-n, mercA now has night and mercB has sun
// (still forces manual correction, and it happens often enough to warrent this improvement (or even question the point of this function)
//new way1= mercA has sun, mercB has night, shift-n, now mercA has night and mercB has night, game reports night vision mode,shift-n again, both have sun goggle report sun vision mode
//new way2= empty face slots are swapped into, also mercs with undesired goggle types swap them out into general inventory

//arynn TODO : include a "swap goggle for individual merc" vs entire squad swap (much like the 'z'|'shft-z' key is for stealth mode)
//arynn TODO : force AP rules during combat

SOLDIERTYPE *pTeamSoldier; // temp pointer for merc
OBJECTTYPE * pObj; // helmet object pointer, used in locating sub-linked attached sun/night vision item
INT8 bLoop; // bLoop : main loop control/index to merc
INT8 bSlot1; // bSlot1= face slot index
INT8 Swap_Goggles_mode=0; // the mode (NVG/SVG) to which the squad is swapping to 0 = unknown/none, 1= swap to NVG, 2= swap to SVG
INT8 Swap_Goggles_facestate=0; // per person state switcher indicating various face swap modes (see comment below)
INT8 item_found_in_helmet=0; // flag to help facilitate swap with empty face slot (limitation with SwapObj(empty slot, attahment slot) ? (i get NADA item in helmet)

for (bLoop=gTacticalStatus.Team[gbPlayerNum].bFirstID, pTeamSoldier=MercPtrs[bLoop]; bLoop <= gTacticalStatus.Team[gbPlayerNum].bLastID; bLoop++, pTeamSoldier++)
{ //loop thru entire team roster

if ( OK_CONTROLLABLE_MERC( pTeamSoldier ) && pTeamSoldier->bAssignment == CurrentSquad( ) && !AM_A_ROBOT( pTeamSoldier ) )
{
//entry here pTeamSoldier is_a merc and in current squad and is not a robot

//first establish Swap_Goggles_mode if not done yet
if(!Swap_Goggles_mode)//master test to jump past redundant testing (no point in rechecking for each merc once Swap_Goggles_mode is set)(just a minor optimization)
{
if(!Swap_Goggles_mode)//check face first
{
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s, look in face.",pTeamSoldier->name);
for (bSlot1 = HEAD1POS; bSlot1 <= HEAD2POS; bSlot1++)
{
if ( Item[pTeamSoldier->inv[bSlot1].usItem].brightlightvisionrangebonus > 0 ){Swap_Goggles_mode=1;}//swap to opposite
else if ( Item[pTeamSoldier->inv[bSlot1].usItem].nightvisionrangebonus > 0 ){Swap_Goggles_mode=2;}//swap to opposite
}
}
if(!Swap_Goggles_mode)//check helmet
{
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s, look in helm.",pTeamSoldier->name);
pObj = &(pTeamSoldier->inv[HELMETPOS]);
for (attachmentList::iterator iter = (*pObj)[0]->attachments.begin(); iter != (*pObj)[0]->attachments.end(); ++iter)
{
if ( Item[ iter->usItem ].brightlightvisionrangebonus > 0 && Item[ iter->usItem ].usItemClass == IC_FACE )
{
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"helm found SVG. brightlightvisionrangebonus = %i", Item[ iter->usItem ].brightlightvisionrangebonus);
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"helm found SVG. nightvisionrangebonus = %i", Item[ iter->usItem ].nightvisionrangebonus);
Swap_Goggles_mode=2;//note change in logic, we set swap to what we found (it might be the only find we ever get)
}
else if ( Item[ iter->usItem ].nightvisionrangebonus > 0 && Item[ iter->usItem ].usItemClass == IC_FACE )
{
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"helm found NVG. brightlightvisionrangebonus = %i", Item[ iter->usItem ].brightlightvisionrangebonus);
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"helm found NVG. nightvisionrangebonus = %i", Item[ iter->usItem ].nightvisionrangebonus);
Swap_Goggles_mode=1;//swap to obj found, we set swap to what we found (it might be the only find we ever get)
}
}
}
if(!Swap_Goggles_mode)//check general inventory
{
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s, look in inv.",pTeamSoldier->name);
OBJECTTYPE* pGoggles;
if (pGoggles = FindSunGogglesInInv( pTeamSoldier ))
{
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"inv found SVG.");
Swap_Goggles_mode=2;//swap to obj found, we set swap to what we found (it might be the only find we ever get)
}
else if (pGoggles = FindNightGogglesInInv( pTeamSoldier ))
{
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"inv found NVG.");
Swap_Goggles_mode=1;//swap to obj found, we set swap to what we found (it might be the only find we ever get)
}
}
if(!Swap_Goggles_mode)//this guy is hopeless, doesnt have anything to swap around
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s does not have any goggles.",pTeamSoldier->name);
continue;//this guy is done, reiterate the loop to the next guy
}
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"PING >> if(!Swap_Goggles_mode) master block");

}//end of determine Swap_Goggles_mode

Swap_Goggles_facestate=0; //initialize with potential fail state, which is adjusted, if applicable, by the following loop

//if here we at least have merc, and now a mode. now we look into face slot situation.
//Swap_Goggles_facestate modes :
//0 face slots unavailable for swap, and no items found
//1 already wearing item goto next guy,
//2 found item to swap out
//3 HEAD1POS was the last empty position found
//4 HEAD2POS was the last empty position found

//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Face slots : 1: %i, 2: %i", pTeamSoldier->inv[HEAD1POS].exists(), pTeamSoldier->inv[HEAD2POS].exists());

for (bSlot1 = HEAD1POS; bSlot1 <= HEAD2POS; bSlot1++)
{
if(Swap_Goggles_mode==1)//1= swap to NVG
{
if ( Item[pTeamSoldier->inv[bSlot1].usItem].nightvisionrangebonus > 0 )
{Swap_Goggles_facestate = 1;break;}//we are wearing NVG already
if ( Item[pTeamSoldier->inv[bSlot1].usItem].brightlightvisionrangebonus > 0 )
{Swap_Goggles_facestate = 2; break;}//ok got item to swap out
if (! pTeamSoldier->inv[bSlot1].exists())
{
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"MT SLOT");
Swap_Goggles_facestate = bSlot1;}//at least there is one empty slot

}
if(Swap_Goggles_mode==2)//2= swap to SVG
{
if ( Item[pTeamSoldier->inv[bSlot1].usItem].brightlightvisionrangebonus > 0 )
{Swap_Goggles_facestate = 1;break;}//we are wearing SVG already
if ( Item[pTeamSoldier->inv[bSlot1].usItem].nightvisionrangebonus > 0 )
{Swap_Goggles_facestate = 2; break;}//ok got item to swap out
if (! pTeamSoldier->inv[bSlot1].exists())
{
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"MT SLOT");
Swap_Goggles_facestate = bSlot1;}//at least there is one empty slot
}
}
/*
//a test block ahead of the actual control flow block's "continue;" (allows us to form a string and display it bfore control flow breaks loop)
CHAR16 tempstr[32];
switch (Swap_Goggles_facestate)
{
case 0 : wcscpy(tempstr, L"no free face slots"); break; //continue to nxt guy
case 1 : wcscpy(tempstr, L"already wearing"); break; //continue to nxt guy
case 2 : wcscpy(tempstr, L"item found"); break; //check bslot
case 3 : wcscpy(tempstr, L"MT head1pos"); break; //set bSlot1 to empty position
case 4 : wcscpy(tempstr, L"MT head2pos"); break; //set bSlot1 to empty position
default : wcscpy(tempstr, L"error"); break; //report error and continue
}

ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s, Swap_Goggles_mode = %i, state = %i %s, slot = %i",
pTeamSoldier->name, Swap_Goggles_mode, Swap_Goggles_facestate, tempstr, bSlot1 );
*/
switch (Swap_Goggles_facestate)
{
case 0 :
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s does not have any available slots for goggles.",pTeamSoldier->name);
continue; break; // fail state no free face slots to swap into
case 1 : continue; break; // fail state already wearing desired goggles
case 2 : break; // bSlot1 index to found object to swap with
case 3 : bSlot1 = Swap_Goggles_facestate;break; // set bSlot1 to last known empty slot
case 4 : bSlot1 = Swap_Goggles_facestate;break; // set bSlot1 to last known empty slot
default : ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"error inside SwapGoggles() varible Swap_Goggles_state");
continue;
break;
}

// if (Swap_Goggles_state != 2) {continue;} // temp fail safe

//if here we have a merc, mode, and now a face slot.. lets find an object (or place) in inventory to swap with
//FIND ITEM IN INV BLOCK ===================================================================================
item_found_in_helmet=0; //re-initialize flag
if(Swap_Goggles_mode==1)//seek NVG
{
int bestBonus = 0;
OBJECTTYPE* pGoggles = FindNightGogglesInInv( pTeamSoldier );
if (pGoggles)
{
bestBonus = Item[pGoggles->usItem].nightvisionrangebonus;
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"NVG found in INV, BONUS = %i",bestBonus);
}
//search for better goggles on the helmet
pObj = &(pTeamSoldier->inv[HELMETPOS]);
for (attachmentList::iterator iter = (*pObj)[0]->attachments.begin(); iter != (*pObj)[0]->attachments.end(); ++iter)
{
if ( Item[ iter->usItem ].nightvisionrangebonus > bestBonus
&& Item[ iter->usItem ].usItemClass == IC_FACE )
{
pGoggles = &(*iter);
bestBonus = Item[ iter->usItem ].nightvisionrangebonus;
item_found_in_helmet = 1;//set item_found_in_helmet flag
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"NVG found in helm, BONUS = %i",bestBonus);
}
}
// ok we have our inventory data time to do something
if ( pGoggles )
{
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"SwapObjs to NVG");
if(Swap_Goggles_facestate == 2)
{
SwapObjs( pTeamSoldier, bSlot1, pGoggles, TRUE ); //object to object swap
//arynn TODO : fix the case where goggles are being placed in illegal inv slots (size problem)
}
else //empty faceslots
{
//ok cant SwapObjs with a helm attachment to an empty face slot (or you get the NADA item in the helm)
if(!item_found_in_helmet)
{
SwapObjs( pTeamSoldier, bSlot1, pGoggles, TRUE ); //object to empty slot swap (non-attachment)
}
else
{ //how to handle ?? remove attach to inv[slot] ? //this looks like its working
pObj->RemoveAttachment(pGoggles, &(pTeamSoldier->inv[ bSlot1 ]));//object to empty slot swap (attachment)
}
}
}
else //no item found in Inventory, try to handle item in face slot
{
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"NVG NOT FOUND");
if(Swap_Goggles_facestate == 2) // drop face item into empty INV slot, bSlot1 holds the position index
{
if(! PlaceInAnyPocket(pTeamSoldier, &pTeamSoldier->inv[bSlot1], FALSE))
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s does not have any room to store their sun goggles.",pTeamSoldier->name);
}
//arynn TODO : add in possiblity to store item in helm (involves checking for helm, and helm can accept attachment)
}
else
{ // this is arrived to, when goggle not on face, nor in inventory
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s does not have any goggles.",pTeamSoldier->name);
}
}
}
// PART 2 FIND ITEM IN INV BLOCK==================================================================================
else if (Swap_Goggles_mode==2)//seek SVG
{
int bestBonus = 0;
OBJECTTYPE* pGoggles = FindSunGogglesInInv( pTeamSoldier );
if (pGoggles)
{
bestBonus = Item[pGoggles->usItem].brightlightvisionrangebonus;
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"SVG found in INV, BONUS = %i",bestBonus);
}
//search for better goggles on the helmet
pObj = &(pTeamSoldier->inv[HELMETPOS]);
for (attachmentList::iterator iter = (*pObj)[0]->attachments.begin(); iter != (*pObj)[0]->attachments.end(); ++iter)
{
if ( Item[ iter->usItem ].brightlightvisionrangebonus > bestBonus
&& Item[ iter->usItem ].usItemClass == IC_FACE )
{
pGoggles = &(*iter);
bestBonus = Item[ iter->usItem ].brightlightvisionrangebonus;
item_found_in_helmet = 1;//set item_found_in_helmet flag
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"SVG found in helm, BONUS = %i",bestBonus);
}
}
// ok we have our inventory data time to do something
if ( pGoggles )
{
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"SwapObjs to SVG");
if(Swap_Goggles_facestate == 2)
{
SwapObjs( pTeamSoldier, bSlot1, pGoggles, TRUE ); //object to object swap
//arynn TODO : fix the case where goggles are being placed in illegal inv slots (size problem)
}
else //empty faceslots
{
//ok cant SwapObjs with a helm attachment to an empty face slot (or you get the NADA item in the helm)
if(!item_found_in_helmet)
{
SwapObjs( pTeamSoldier, bSlot1, pGoggles, TRUE ); //object to empty slot swap (non-attachment)
}
else
{ //how to handle ?? remove attach to inv[slot] ? //this looks like its working
pObj->RemoveAttachment(pGoggles, &(pTeamSoldier->inv[ bSlot1 ]));//object to empty slot swap (attachment)
}
}
}
else //no item found in Inventory, try to handle item in face slot
{
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"SVG NOT FOUND");
if(Swap_Goggles_facestate == 2) // drop face item into empty INV slot, bSlot1 holds the position index
{
if(! PlaceInAnyPocket(pTeamSoldier, &pTeamSoldier->inv[bSlot1], FALSE))
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s does not have any room to store their night vision goggles.",pTeamSoldier->name);
}
//arynn TODO : add in possiblity to store item in helm (involves checking for helm, and helm can accept attachment)
}
else
{ // this is arrived to, when goggle not on face, nor in inventory
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s does not have any goggles.",pTeamSoldier->name);
}
}
}
fCharacterInfoPanelDirty = TRUE;
fInterfacePanelDirty = DIRTYLEVEL2;
pTeamSoldier->DeleteSoldierLight( );
pTeamSoldier->PositionSoldierLight( );
}//end of pTeamSoldier is_a merc and in current squad and is not a robot
}//end of Loop Team

//master level output statements
if(Swap_Goggles_mode == 0) {ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"No one owns any goggles.");}
if(Swap_Goggles_mode == 1) {ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Squad set for night vision.");}
if(Swap_Goggles_mode == 2) {ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Squad set for sun goggles.");}
}

Nice work Arynn. Here's a thought you could add a check, if it's day or night and make the merc automatically equip the nv goggles or sunglasses etc...

@ Starwlker
I understand what you're saying. However i think the idea is more of a "im toggling this stuff already, might as toggle to the right mode in one stroke" Seriously i'm considering this as an idea to justify AP cost (see below).

Index: Utils/Cursors.cpp
===================================================================
--- Utils/Cursors.cpp (revision 1869)
+++ Utils/Cursors.cpp (working copy)
@@ -1293,12 +1293,40 @@

}

+//j
+void check_mouse_restriction(void)
+{
+ static bool mouse_clipped = false;
+ static long ticks;
+
+ if (gfKeyState[ALT] && gfKeyState[CTRL] && time(NULL) > ticks + 2)
+ if (mouse_clipped)
+ {
+ mouse_clipped = false;
+ ClipCursor(NULL);
+ ScreenMsg(140,0,L"Cursor Freed");
+ ticks = time(NULL);
+ }
+ else
+ {
+ mouse_clipped = true;
+ RECT aRect;
+ SetRect(&aRect,0,0,SCREEN_WIDTH,SCREEN_HEIGHT);
+ ClientToScreen(ghWindow,(LPPOINT)&aRect);
+ ClientToScreen(ghWindow,(LPPOINT)&aRect+1);
+ ClipCursor(&aRect);
+ ScreenMsg(140,0,L"Cursor Clipped");
+ ticks = time(NULL);
+ }
+}
void BltJA2CursorData( )
{
if ( ( gViewportRegion.uiFlags & MSYS_MOUSE_IN_AREA ) )
{
DrawMouseText();
DrawMouseGraphics();
+//j
+ check_mouse_restriction();
}
}