1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Externalizations (by Buggler)

Browse Source 
- Queen Palace & Interrogate meanwhile stuff
- Initial POW stuff in Alma
- Sectors for triggering Meduna outskirts meanwhile scene
- Add Iggy to location when game progress condition met
- Add Rat to location after creature meanwhile scene

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-10-11 06:55:31 +00:00
parent 3ab6da635f
commit f72e4424eb
11 changed files with 159 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Meanwhile.cpp
+30 -30
View File
@@ -486,7 +486,7 @@ void StartMeanwhile( )
// Force reload of NPC files...
ReloadQuoteFile( QUEEN );
ChangeNpcToDifferentSector( QUEEN, 3, 16, 0 );
ChangeNpcToDifferentSector( QUEEN, gModSettings.ubMeanwhilePalaceSectorX, gModSettings.ubMeanwhilePalaceSectorY, 0 ); //3, 16
}
// SAVE MESSANGER!
@@ -502,7 +502,7 @@ void StartMeanwhile( )
// Force reload of NPC files...
ReloadQuoteFile( ELLIOT );
ChangeNpcToDifferentSector( ELLIOT, 3, 16, 0 );
ChangeNpcToDifferentSector( ELLIOT, gModSettings.ubMeanwhilePalaceSectorX, gModSettings.ubMeanwhilePalaceSectorY, 0 );
}
if ( gCurrentMeanwhileDef.ubMeanwhileID == OUTSKIRTS_MEDUNA )
@@ -520,7 +520,7 @@ void StartMeanwhile( )
// Force reload of NPC files...
ReloadQuoteFile( JOE );
ChangeNpcToDifferentSector( JOE, 3, 16, 0 );
ChangeNpcToDifferentSector( JOE, gModSettings.ubMeanwhilePalaceSectorX, gModSettings.ubMeanwhilePalaceSectorY, 0 );
}
}
@@ -542,7 +542,7 @@ void StartMeanwhile( )
// Force reload of NPC files...
ReloadQuoteFile( QUEEN );
ChangeNpcToDifferentSector( QUEEN, 7, 14, 0 );
ChangeNpcToDifferentSector( QUEEN, gModSettings.ubMeanwhileInterrogatePOWSectorX, gModSettings.ubMeanwhileInterrogatePOWSectorY, 0 ); // 7, 14
}
// SAVE MESSANGER!
@@ -558,7 +558,7 @@ void StartMeanwhile( )
// Force reload of NPC files...
ReloadQuoteFile( ELLIOT );
ChangeNpcToDifferentSector( ELLIOT, 7, 14, 0 );
ChangeNpcToDifferentSector( ELLIOT, gModSettings.ubMeanwhileInterrogatePOWSectorX, gModSettings.ubMeanwhileInterrogatePOWSectorY, 0 );
}
// SAVE JOE!
@@ -574,7 +574,7 @@ void StartMeanwhile( )
// Force reload of NPC files...
ReloadQuoteFile( JOE );
ChangeNpcToDifferentSector( JOE, 7, 14, 0 );
ChangeNpcToDifferentSector( JOE, gModSettings.ubMeanwhileInterrogatePOWSectorX, gModSettings.ubMeanwhileInterrogatePOWSectorY, 0 );
}
break;
@@ -850,7 +850,7 @@ void EndMeanwhile( )
gMercProfiles[ ubProfile ].sSectorX = gNPCSaveData[ cnt ].sX;
gMercProfiles[ ubProfile ].sSectorY = gNPCSaveData[ cnt ].sY;
gMercProfiles[ ubProfile ].bSectorZ = (INT8)gNPCSaveData[ cnt ].sZ;
gMercProfiles[ ubProfile ].sGridNo = (INT8)gNPCSaveData[ cnt ].sGridNo;
gMercProfiles[ ubProfile ].sGridNo = (INT32)gNPCSaveData[ cnt ].sGridNo;
// Ensure NPC files loaded...
ReloadQuoteFile( ubProfile );
@@ -899,7 +899,7 @@ void DoneFadeOutMeanwhileOnceDone( )
gMercProfiles[ ubProfile ].sSectorX = gNPCSaveData[ cnt ].sX;
gMercProfiles[ ubProfile ].sSectorY = gNPCSaveData[ cnt ].sY;
gMercProfiles[ ubProfile ].bSectorZ = (INT8)gNPCSaveData[ cnt ].sZ;
gMercProfiles[ ubProfile ].sGridNo = (INT8)gNPCSaveData[ cnt ].sGridNo;
gMercProfiles[ ubProfile ].sGridNo = (INT32)gNPCSaveData[ cnt ].sGridNo;
// Ensure NPC files loaded...
ReloadQuoteFile( ubProfile );
@@ -975,8 +975,8 @@ void HandleCreatureRelease( void )
UINT32 uiTime = 0;
MEANWHILE_DEFINITION MeanwhileDef;
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -997,8 +997,8 @@ void HandleMeanWhileEventPostingForTownLiberation( UINT8 bTownId )
UINT8 ubId = 0;
BOOLEAN fHandled = FALSE;
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -1053,8 +1053,8 @@ void HandleMeanWhileEventPostingForTownLoss( UINT8 bTownId )
return;
}
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -1084,8 +1084,8 @@ void HandleMeanWhileEventPostingForSAMLiberation( INT8 bSamId )
return;
}
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -1132,8 +1132,8 @@ void HandleFlowersMeanwhileScene( INT8 bTimeCode )
return;
}
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -1165,8 +1165,8 @@ void HandleOutskirtsOfMedunaMeanwhileScene( void )
return;
}
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -1188,8 +1188,8 @@ void HandleKillChopperMeanwhileScene( void )
return;
}
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -1211,8 +1211,8 @@ void HandleScientistAWOLMeanwhileScene( void )
return;
}
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -1234,8 +1234,8 @@ void HandleInterrogationMeanwhileScene( void )
return;
}
MeanwhileDef.sSectorX = 7; // what sector?
MeanwhileDef.sSectorY = MAP_ROW_N;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhileInterrogatePOWSectorX; // interrogate sector
MeanwhileDef.sSectorY = gModSettings.ubMeanwhileInterrogatePOWSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -1258,8 +1258,8 @@ void HandleFirstBattleVictory( void )
return;
}
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;
@@ -1286,8 +1286,8 @@ void HandleDelayedFirstBattleVictory( void )
return;
}
MeanwhileDef.sSectorX = 3;
MeanwhileDef.sSectorY = 16;
MeanwhileDef.sSectorX = gModSettings.ubMeanwhilePalaceSectorX;
MeanwhileDef.sSectorY = gModSettings.ubMeanwhilePalaceSectorY;
MeanwhileDef.ubNPCNumber = QUEEN;
MeanwhileDef.usTriggerEvent = 0;