1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

************************************************************

Browse Source 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Dialogue.cpp
+34 -19
View File
@@ -1800,7 +1800,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
ExitGrid.ubGotoSectorX = 10;
ExitGrid.ubGotoSectorY = 1;
ExitGrid.ubGotoSectorZ = 1;
ExitGrid.usGridNo = 12722;
ExitGrid.usGridNo = 12722; //dnl!!!
ApplyMapChangesToMapTempFile( TRUE );
AddExitGridToWorld( 7887, &ExitGrid );
@@ -2260,7 +2260,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
case NPC_ACTION_SEND_PACOS_INTO_HIDING:
pSoldier = FindSoldierByProfileID( 114, FALSE );
sGridNo = 16028;
sGridNo = 16028; //dnl!!!
if (pSoldier)
{
if (NewOKDestination( pSoldier, sGridNo, TRUE, 0 ) )
@@ -2280,7 +2280,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
break;
case NPC_ACTION_HAVE_PACOS_FOLLOW:
pSoldier = FindSoldierByProfileID( 114, FALSE );
sGridNo = 18193;
sGridNo = 18193; //dnl!!!
if (pSoldier)
{
if (NewOKDestination( pSoldier, sGridNo, TRUE, 0 ) )
@@ -2314,6 +2314,8 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
case NPC_ACTION_TRIGGER_END_OF_FOOD_QUEST:
AddHistoryToPlayersLog( HISTORY_TALKED_TO_FATHER_WALKER, 0, GetWorldTotalMin(), gWorldSectorX, gWorldSectorY );
AddFutureDayStrategicEvent( EVENT_SET_BY_NPC_SYSTEM, GetWorldMinutesInDay(), NPC_SYSTEM_EVENT_ACTION_PARAM_BONUS + NPC_ACTION_TRIGGER_END_OF_FOOD_QUEST, 1 );
// SANDRO - merc records - quest counter (food quest)
GiveQuestRewardPoint( gWorldSectorX, gWorldSectorY, 4, NO_PROFILE );
break;
case NPC_ACTION_REMOVE_CONRAD:
@@ -2355,10 +2357,9 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
break;
case NPC_ACTION_DELAYED_MAKE_BRENDA_LEAVE:
// set event to invoke Brenda's (#85) record 9 a minute from
// now
// set event to invoke Brenda's (#85) record 9 ten minutes from now
DeleteTalkingMenu();
AddSameDayStrategicEvent( EVENT_SET_BY_NPC_SYSTEM, GetWorldMinutesInDay() + 360, NPC_SYSTEM_EVENT_ACTION_PARAM_BONUS + NPC_ACTION_DELAYED_MAKE_BRENDA_LEAVE );
AddSameDayStrategicEvent( EVENT_SET_BY_NPC_SYSTEM, GetWorldMinutesInDay() + 10, NPC_SYSTEM_EVENT_ACTION_PARAM_BONUS + NPC_ACTION_DELAYED_MAKE_BRENDA_LEAVE );
break;
case NPC_ACTION_SEX:
@@ -2373,7 +2374,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
// add a money item with $10000 to the tile in front of Kyle
// and then have him pick it up
{
INT32 sGridNo = 14952;
INT32 sGridNo = 14952; //dnl!!!
INT32 iWorldItem;
pSoldier = FindSoldierByProfileID( ubTargetNPC, FALSE );
@@ -2451,25 +2452,25 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
case NPC_ACTION_OPEN_CARLAS_DOOR:
if (usActionCode == NPC_ACTION_OPEN_CARLAS_DOOR )
{
sGridNo = 12290;
sGridNo = 12290; //dnl!!!
}
// fall through
case NPC_ACTION_OPEN_CINDYS_DOOR:
if (usActionCode == NPC_ACTION_OPEN_CINDYS_DOOR )
{
sGridNo = 13413;
sGridNo = 13413; //dnl!!!
}
// fall through
case NPC_ACTION_OPEN_BAMBIS_DOOR:
if (usActionCode == NPC_ACTION_OPEN_BAMBIS_DOOR )
{
sGridNo = 11173;
sGridNo = 11173; //dnl!!!
}
// fall through
case NPC_ACTION_OPEN_MARIAS_DOOR:
if (usActionCode == NPC_ACTION_OPEN_MARIAS_DOOR )
{
sGridNo = 10852;
sGridNo = 10852; //dnl!!!
}
// JA3Gold: unlock the doors instead of opening them
{
@@ -2890,6 +2891,15 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
}
// CJC Nov 28 2002 - fixed history record which didn't have location specified
AddHistoryToPlayersLog( HISTORY_GAVE_CARMEN_HEAD, 0, GetWorldTotalMin(), gWorldSectorX, gWorldSectorY );
// SANDRO - end the quest here - the team will gain exp and records by now
if (gMercProfiles[ CARMEN ].bNPCData <= 0)
{
SetFactTrue( FACT_ALL_TERRORISTS_KILLED );
EndQuest( QUEST_KILL_TERRORISTS, gWorldSectorX, gWorldSectorY );
IncrementTownLoyaltyEverywhere( LOYALTY_BONUS_TERRORISTS_DEALT_WITH );// end terrorist quest
}
break;
case NPC_ACTION_CARMEN_LEAVES_FOR_GOOD:
@@ -2903,13 +2913,14 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
break;
case NPC_ACTION_CARMEN_LEAVES_ON_NEXT_SECTOR_LOAD:
if (gMercProfiles[ CARMEN ].bNPCData == 0)
{
SetFactTrue( FACT_ALL_TERRORISTS_KILLED );
// the next time we change sectors, quest 2 will be set to done
// SANDRO - removed from here
// if (gMercProfiles[ CARMEN ].bNPCData == 0)
//{
// SetFactTrue( FACT_ALL_TERRORISTS_KILLED );
// // the next time we change sectors, quest 2 will be set to done
IncrementTownLoyaltyEverywhere( LOYALTY_BONUS_TERRORISTS_DEALT_WITH );
}
// IncrementTownLoyaltyEverywhere( LOYALTY_BONUS_TERRORISTS_DEALT_WITH );
//}
// anyhow Carmen has given the player money so reset his balance to 0.
gMercProfiles[ CARMEN ].uiMoney = 0;
break;
@@ -3186,7 +3197,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
if ( pSoldier->ubProfile == ARMAND )
{
sGridNo = 6968;
sGridNo = 6968; //dnl!!!
}
else
{
@@ -3933,6 +3944,8 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
else
{
TriggerNPCRecord( SERGEANT, 12 );
// SANDRO - give reward for rescuing Krott and getting the rocket rifle
GiveQuestRewardPoint( gWorldSectorX, gWorldSectorY, 5, CONRAD );
}
break;
@@ -3985,6 +3998,8 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
if ( gfLastBoxingMatchWonByPlayer && !BoxerAvailable() )
{
TriggerNPCRecord( KINGPIN, 15 );
// SANDRO - merc records - quest counter (Kingpin impressed)
GiveQuestRewardPoint( gWorldSectorX, gWorldSectorY, 4, NO_PROFILE );
}
break;
@@ -4845,7 +4860,7 @@ BOOLEAN NPCOpenThing( SOLDIERTYPE *pSoldier, BOOLEAN fDoor )
// for Armand, hard code to tile 6968
if ( pSoldier->ubProfile == ARMAND )
{
sStructGridNo = 6968;
sStructGridNo = 6968; //dnl!!!
}
else
{