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

Externalized (by Buggler)

Browse Source 
- AWOL scientist location
- Brothel sector
- Call Kingpin over for boxing match
- fact Tony in building
- meet Carmen for reward
- moved John & Mary unescort sector from Mod_Settings.ini to LUA

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6495 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-10-14 11:57:08 +00:00
parent dcf1df3c72
commit 7f489a1b53
9 changed files with 116 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Luaglobal.cpp
+24
View File
@@ -395,6 +395,30 @@ void IniGlobalGameSetting(lua_State *L)
lua_pushinteger(L, gModSettings.ubHospitalSectorZ);
lua_setglobal(L, "iniHOSPITAL_SECTOR_Z");
lua_pushinteger(L, gModSettings.ubMeanwhileAddMadlabSector1X);
lua_setglobal(L, "iniADD_MADLAB_SECTOR_1_X");
lua_pushinteger(L, gModSettings.ubMeanwhileAddMadlabSector1Y);
lua_setglobal(L, "iniADD_MADLAB_SECTOR_1_Y");
lua_pushinteger(L, gModSettings.ubMeanwhileAddMadlabSector2X);
lua_setglobal(L, "iniADD_MADLAB_SECTOR_2_X");
lua_pushinteger(L, gModSettings.ubMeanwhileAddMadlabSector2Y);
lua_setglobal(L, "iniADD_MADLAB_SECTOR_2_Y");
lua_pushinteger(L, gModSettings.ubMeanwhileAddMadlabSector3X);
lua_setglobal(L, "iniADD_MADLAB_SECTOR_3_X");
lua_pushinteger(L, gModSettings.ubMeanwhileAddMadlabSector3Y);
lua_setglobal(L, "iniADD_MADLAB_SECTOR_3_Y");
lua_pushinteger(L, gModSettings.ubMeanwhileAddMadlabSector4X);
lua_setglobal(L, "iniADD_MADLAB_SECTOR_4_X");
lua_pushinteger(L, gModSettings.ubMeanwhileAddMadlabSector4Y);
lua_setglobal(L, "iniADD_MADLAB_SECTOR_4_Y");
// -------------------------------
// Other global variables
Strategic/Meanwhile.cpp
+12 -12
View File
@@ -750,25 +750,25 @@ void ProcessImplicationsOfMeanwhile( void )
StartQuest( QUEST_FIND_SCIENTIST, -1, -1 );
// place Madlab and robot!
if ( SectorInfo[ SECTOR( 7, MAP_ROW_H ) ].uiFlags & SF_USE_ALTERNATE_MAP )
if ( SectorInfo[ SECTOR( gModSettings.ubMeanwhileAddMadlabSector1X, gModSettings.ubMeanwhileAddMadlabSector1Y ) ].uiFlags & SF_USE_ALTERNATE_MAP ) //(7, 8)
{
sSectorX = 7;
sSectorY = MAP_ROW_H;
sSectorX = gModSettings.ubMeanwhileAddMadlabSector1X;
sSectorY = gModSettings.ubMeanwhileAddMadlabSector1Y;
}
else if ( SectorInfo[ SECTOR( 16, MAP_ROW_H ) ].uiFlags & SF_USE_ALTERNATE_MAP )
else if ( SectorInfo[ SECTOR( gModSettings.ubMeanwhileAddMadlabSector2X, gModSettings.ubMeanwhileAddMadlabSector2Y ) ].uiFlags & SF_USE_ALTERNATE_MAP ) //(16, 8)
{
sSectorX = 16;
sSectorY = MAP_ROW_H;
sSectorX = gModSettings.ubMeanwhileAddMadlabSector2X;
sSectorY = gModSettings.ubMeanwhileAddMadlabSector2Y;
}
else if ( SectorInfo[ SECTOR( 11, MAP_ROW_I ) ].uiFlags & SF_USE_ALTERNATE_MAP )
else if ( SectorInfo[ SECTOR( gModSettings.ubMeanwhileAddMadlabSector3X, gModSettings.ubMeanwhileAddMadlabSector3Y ) ].uiFlags & SF_USE_ALTERNATE_MAP ) //(11, 9)
{
sSectorX = 11;
sSectorY = MAP_ROW_I;
sSectorX = gModSettings.ubMeanwhileAddMadlabSector3X;
sSectorY = gModSettings.ubMeanwhileAddMadlabSector3Y;
}
else if ( SectorInfo[ SECTOR( 4, MAP_ROW_E ) ].uiFlags & SF_USE_ALTERNATE_MAP )
else if ( SectorInfo[ SECTOR( gModSettings.ubMeanwhileAddMadlabSector4X, gModSettings.ubMeanwhileAddMadlabSector4Y ) ].uiFlags & SF_USE_ALTERNATE_MAP ) //(4, 5)
{
sSectorX = 4;
sSectorY = MAP_ROW_E;
sSectorX = gModSettings.ubMeanwhileAddMadlabSector4X;
sSectorY = gModSettings.ubMeanwhileAddMadlabSector4Y;
}
else
{
Strategic/Quests.cpp
+2 -1
View File
@@ -1156,7 +1156,8 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
break;
case FACT_TONY_IN_BUILDING:
gubFact[usFact] = CheckNPCSector( TONY, 5, MAP_ROW_C, 0 ) && NPCInRoom( TONY, gModSettings.usPornShopRoomTony );
gubFact[usFact] = CheckNPCSector( TONY, gModSettings.ubPornShopTonySectorX, gModSettings.ubPornShopTonySectorY, gModSettings.ubPornShopTonySectorZ ) &&
NPCInRoom( TONY, gModSettings.usPornShopRoomTony );
break;
case FACT_SHANK_SPEAKING:
Strategic/Quests.h
+2 -2
View File
@@ -575,10 +575,10 @@ enum Facts
#define OMERTA_LEAVE_EQUIP_GRIDNO gModSettings.iOmertaDropOff //4868
// NB brothel rooms 88-90 removed because they are the antechamber
#define IN_BROTHEL( room ) (gWorldSectorX == 5 && gWorldSectorY == MAP_ROW_C && (room) >= gModSettings.usBrothelRoomRangeStart && (room) <= gModSettings.usBrothelRoomRangeEnd) //91,119
#define IN_BROTHEL( room ) (gWorldSectorX == gModSettings.ubBrothelSectorX && gWorldSectorY == gModSettings.ubBrothelSectorY && (room) >= gModSettings.usBrothelRoomRangeStart && (room) <= gModSettings.usBrothelRoomRangeEnd) //5, 3, 91,119
#define IN_BROTHEL_GUARD_ROOM( room ) ( room == gModSettings.usBrothelGuardRoom ) //110
#define IN_KINGPIN_HOUSE( room ) ( gWorldSectorX == 5 && gWorldSectorY == MAP_ROW_D && (room) >= 30 && (room) <= 39 )
#define IN_KINGPIN_HOUSE( room ) ( gWorldSectorX == gModSettings.ubKingpinHouseSectorX && gWorldSectorY == gModSettings.ubKingpinHouseSectorY && gbWorldSectorZ == gModSettings.ubKingpinHouseSectorZ && (room) >= gModSettings.usKingpinRoomRangeStart && (room) <= gModSettings.usKingpinRoomRangeEnd ) //5, 4, 0, 30, 39
#define LOYALTY_LOW_THRESHOLD 30
#define LOYALTY_OK_THRESHOLD 50
Strategic/Strategic Event Handler.cpp
+17
View File
@@ -988,6 +988,23 @@ void HandleEarlyMorningEvents( void )
gMercProfiles[ RAT ].bSectorZ = 0;
}
// Does John leave country after quest completion?
if ( gubQuest[ QUEST_ESCORT_TOURISTS ] == QUESTDONE && (gMercProfiles[ JOHN ].sSectorX == 13) &&
(gMercProfiles[ JOHN ].sSectorY == MAP_ROW_B) && (gMercProfiles[ JOHN ].bSectorZ == 0) )
{
gMercProfiles[ JOHN ].sSectorX = 0;
gMercProfiles[ JOHN ].sSectorY = 0;
gMercProfiles[ JOHN ].bSectorZ = 0;
}
// Does Mary leave country after quest completion?
if ( gubQuest[ QUEST_ESCORT_TOURISTS ] == QUESTDONE && (gMercProfiles[ MARY ].sSectorX == 13) &&
(gMercProfiles[ MARY ].sSectorY == MAP_ROW_B) && (gMercProfiles[ MARY ].bSectorZ == 0) )
{
gMercProfiles[ MARY ].sSectorX = 0;
gMercProfiles[ MARY ].sSectorY = 0;
gMercProfiles[ MARY ].bSectorZ = 0;
}
// Empty money from pockets of Vince 69, Willis 80, and Jenny 132
SetMoneyInSoldierProfile( VINCE, 0 );