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

Fixes to npc-actions Pacos

Browse Source
This commit is contained in:
kitty624
2025-08-07 23:30:09 +02:00
parent c3a34a660d
commit 6a9df9f22c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Dialogue.cpp
+3 -2
View File
@@ -2353,7 +2353,8 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
break; break;
case NPC_ACTION_HAVE_PACOS_FOLLOW: case NPC_ACTION_HAVE_PACOS_FOLLOW:
pSoldier = FindSoldierByProfileID( 114, FALSE ); pSoldier = FindSoldierByProfileID( 114, FALSE );
sGridNo = 18193; //dnl!!! sGridNo = 8537; //dnl!!!
//kitty: changed gridno from 18193 to 8537, that's at entrance door to rebel basement, where Fatima and Dimitri dialogue happens
if (pSoldier) if (pSoldier)
{ {
if (NewOKDestination( pSoldier, sGridNo, TRUE, 0 ) ) if (NewOKDestination( pSoldier, sGridNo, TRUE, 0 ) )
@@ -4331,7 +4332,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
case NPC_ACTION_PUT_PACOS_IN_BASEMENT: case NPC_ACTION_PUT_PACOS_IN_BASEMENT:
gMercProfiles[ PACOS ].sSectorX = 10; gMercProfiles[ PACOS ].sSectorX = 10;
gMercProfiles[ PACOS ].sSectorY = MAP_ROW_A; gMercProfiles[ PACOS ].sSectorY = MAP_ROW_A;
gMercProfiles[ PACOS ].bSectorZ = 0; gMercProfiles[ PACOS ].bSectorZ = 1; //kitty: fixed - first level underground is 1, not 0
break; break;
case NPC_ACTION_HISTORY_ASSASSIN: case NPC_ACTION_HISTORY_ASSASSIN:
AddHistoryToPlayersLog( HISTORY_ASSASSIN, 0, GetWorldTotalMin(), gWorldSectorX, gWorldSectorY ); AddHistoryToPlayersLog( HISTORY_ASSASSIN, 0, GetWorldTotalMin(), gWorldSectorX, gWorldSectorY );
Tactical/Overhead.cpp
+1 -1
View File
@@ -7915,7 +7915,7 @@ BOOLEAN CheckForEndOfBattle( BOOLEAN fAnEnemyRetreated )
if ( CheckFact( FACT_FIRST_BATTLE_BEING_FOUGHT, 0 ) ) if ( CheckFact( FACT_FIRST_BATTLE_BEING_FOUGHT, 0 ) )
{ {
// ATE: Need to trigger record for this event .... for NPC scripting // ATE: Need to trigger record for this event .... for NPC scripting
TriggerNPCRecord( PACOS, 18 ); TriggerNPCRecord( PACOS, 20 );
// this is our first battle... and we won! // this is our first battle... and we won!
SetFactTrue( FACT_FIRST_BATTLE_FOUGHT ); SetFactTrue( FACT_FIRST_BATTLE_FOUGHT );