New Lua Externalization (Quests.lua) (by Jazz)

- New File "Quests.lua"
- Modders can now define new events relating to tasks (from 0 to 254)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6139 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Init.cpp

@@ -1269,7 +1269,7 @@ if ( ReadXMLEmail == TRUE )
 
 BackupBRandEncyclopedia ( gEncyclopediaLocationData, gEncyclopediaLocationDataBackup , 0);
 BackupBRandEncyclopedia ( gEncyclopediaProfilesData, gEncyclopediaProfilesDataBackup, 1);
-BackupBRandEncyclopedia ( gEncyclopediaInventoryDatag, EncyclopediaInventoryDataBackup , 2);
+BackupBRandEncyclopedia ( gEncyclopediaInventoryData, gEncyclopediaProfilesDataBackup , 2);
 BackupBRandEncyclopedia ( gEncyclopediaQuestsData, gEncyclopediaQuestsDataBackup, 3);
 
 

Strategic/LuaInitNPCs.cpp

@@ -321,6 +321,7 @@ static int l_InTownSectorWithTrainingLoyalty (lua_State *L);
 static int l_gubQuest (lua_State *L);
 static int l_UnRecruitEPC (lua_State *L);
 static int l_MakeHostile (lua_State *L);
+static int l_SetgubQuest (lua_State *L);
 
 static int l_PythSpacesAway (lua_State *L);
 static int l_FindSoldierTeam (lua_State *L);
@@ -755,6 +756,8 @@ static int l_CreateKeyAndAddItemToPool (lua_State *L);
 static int l_CreateKeyProfInvAndAddItemToPool (lua_State *L);
 static int l_usStrategicInsertionDataProfileID (lua_State *L);
 
+BOOLEAN LuaInternalQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY, BOOLEAN fUpdateHistory );
+static int l_GiveQuestRewardPoint(lua_State *L);
 
 using namespace std;
 
@@ -844,7 +847,7 @@ void IniGlobal_1(lua_State *L)
 		lua_setglobal(L, "ProfileIdsGridNo");	
 		
 }		
-void IniFunction(lua_State *L)
+void IniFunction(lua_State *L, BOOLEAN bQuests )
 {
 
 	lua_register(L, "HireMerc", l_HireMerc);
@@ -1079,16 +1082,24 @@ void IniFunction(lua_State *L)
 	lua_register(L, "ActionDoorClose", l_Action_door_close);	
 
 	//------Fact and Quest------
-	
+	if ( bQuests = TRUE )
+	{
 	lua_register(L, "SetFactTrue", l_SetFactTrue);
 	lua_register(L, "SetFactFalse", l_SetFactFalse);
+	}
+	
 	lua_register(L, "CheckFact", l_CheckFact);
 	lua_register(L, "CheckQuest", l_gubQuest);
+	if ( bQuests = TRUE )
+	{
 	lua_register(L, "StartQuest", l_StartQuest);
 	lua_register(L, "EndQuest", l_EndQuest);
+	}
 	lua_register(L, "gubFact", l_gubFact);
 	lua_register(L, "GetgubFact", l_GetgubFact);
 	lua_register(L, "gubQuest", l_gubQuest);
+	lua_register(L, "GiveQuestRewardPoint", l_GiveQuestRewardPoint);
+	lua_register(L, "SetQuest", l_SetgubQuest);
 	
 	//------Objects------
 	
@@ -1493,7 +1504,7 @@ BOOLEAN LuaIntro(UINT8 Init, UINT32 uiCurrentVideo, INT8 bIntroType, UINT32 iStr
 
 	LuaScopeState _LS(true);
 
-	IniFunction( _LS.L() );
+	IniFunction( _LS.L(), TRUE );
 	IniGlobalGameSetting( _LS.L() );
 
 	SGP_THROW_IFFALSE( _LS.L.EvalFile(filename), _BS("Cannot open file: ") << filename << _BS::cget );
@@ -1624,7 +1635,7 @@ BOOLEAN LetLuaMakeBadSectorListFromMapsOnHardDrive(UINT8 Init)
 	lua_State *L = lua_open();
 	luaL_openlibs(L);
 
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -1669,7 +1680,7 @@ BOOLEAN LuaInitStrategicLayer(UINT8 Init)
 	lua_State *L = lua_open();
 	luaL_openlibs(L);
 
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2196,7 +2207,7 @@ BOOLEAN LuaCheckFact ( UINT16 usFact, UINT8 ubProfileID , UINT32 Init )
 
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2246,7 +2257,7 @@ BOOLEAN LuaCheckForKingpinsMoneyMissing( BOOLEAN fFirstCheck, UINT8 Init)
 	//init function
 	lua_register(L, "CheckFact", l_CheckFact);
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	
@@ -2297,7 +2308,7 @@ BOOLEAN LuaHandleDelayedItemsArrival( UINT32 uiReason, UINT8 Init)
 	lua_register(L, "CheckFact", l_CheckFact);
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2348,7 +2359,7 @@ BOOLEAN LuaHandleQuestCodeOnSectorEntry( INT16 sSectorX, INT16 sSectorY, INT8 bS
 	lua_register(L, "CheckFact", l_CheckFact);
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2401,7 +2412,7 @@ BOOLEAN LuaHandleQuestCodeOnSector( INT16 sSectorX, INT16 sSectorY, INT8 bSector
 	lua_register(L, "CheckFact", l_CheckFact);
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2467,7 +2478,7 @@ BOOLEAN LetLuaGameInit(UINT8 Init)
 	lua_register(L, "CheckFact", l_CheckFact);
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 //	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2529,7 +2540,7 @@ BOOLEAN LuaHandleNPCTeamMemberDeath(UINT8 ProfileId, UINT8 Init)
 	lua_register(L, "CheckFact", l_CheckFact);	
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2580,7 +2591,7 @@ BOOLEAN LuaHandlePlayerTeamMemberDeath(UINT8 ProfileId, UINT8 Init)
 	lua_register(L, "CheckFact", l_CheckFact);	
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2606,6 +2617,79 @@ BOOLEAN LuaHandlePlayerTeamMemberDeath(UINT8 ProfileId, UINT8 Init)
 
 }
 
+BOOLEAN LuaInternalQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY, BOOLEAN fUpdateHistory, UINT32 Init)
+{
+	char * filename = "scripts\\Quests.lua";
+	UINT32 size, bytesRead;
+	char* buffer;
+	
+	HWFILE file = FileOpen(filename, FILE_ACCESS_READ, FALSE);
+
+	if (!file)
+	{
+		string msg("Cannot open file: ");
+		msg.append(filename);
+		SGP_THROW(msg);
+	}
+
+	size = FileSize(filename);
+	buffer = new char[size+1];
+	buffer[size] = 0;
+	FileRead(file, buffer, size, &bytesRead);
+	FileClose(file);
+
+
+	lua_State *L = lua_open();
+	luaL_openlibs(L);
+
+	//init function
+	IniFunction(L,FALSE);
+	IniGlobalGameSetting(L);
+	
+	if (luaL_dostring(L, buffer))
+	{
+		// oh noes, error
+		// TODO: write to log or something
+		return false;
+	}
+	
+	if ( Init == 0 )
+	{
+
+		IniGlobal_0(L);
+		lua_getglobal(L , "InternalEndQuest");
+		
+		lua_pushnumber (L, ubQuest );
+		lua_pushnumber (L, sSectorX );
+		lua_pushnumber (L, sSectorY );
+		lua_pushboolean (L, fUpdateHistory );
+		
+		lua_call(L,4,0); 
+	}
+	
+	if ( Init == 1 )
+	{
+
+		IniGlobal_0(L);
+		lua_getglobal(L , "InternalStartQuest");
+		
+		lua_pushnumber (L, ubQuest );
+		lua_pushnumber (L, sSectorX );
+		lua_pushnumber (L, sSectorY );
+		lua_pushboolean (L, fUpdateHistory );
+		
+		lua_call(L,4,0); 
+	}
+
+	lua_close(L);
+
+	delete[] buffer;
+	
+	
+	return true;
+
+}
+
 BOOLEAN LetLuaMyCustomHandleAtNewGridNo(UINT8 bNewSide, UINT8 ProfileId, UINT8 Init)
 {
 	char * filename = "scripts\\Overhead.lua";
@@ -2635,7 +2719,7 @@ BOOLEAN LetLuaMyCustomHandleAtNewGridNo(UINT8 bNewSide, UINT8 ProfileId, UINT8 I
 //	lua_register(L, "CheckFact", l_CheckFact);	
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 //	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2760,7 +2844,7 @@ BOOLEAN LuaHandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQu
 	lua_register(L, "CheckFact", l_CheckFact);	
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2815,7 +2899,7 @@ BOOLEAN LetLuaInterfaceDialogue( UINT8 ubNPC, UINT8 InitFunction)
 	lua_register(L, "CheckFact", l_CheckFact);	
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2874,7 +2958,7 @@ BOOLEAN LetLuaPerformItemAction(UINT32 ActionID, INT32 sGridNo , UINT8 InitFunct
 	lua_register(L, "CheckFact", l_CheckFact);	
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -2936,7 +3020,7 @@ BOOLEAN LetLuaHourlyQuestUpdate(UINT8 Init)
 //	lua_register(L, "CheckFact", l_CheckFact);	
 //	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 //	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 
 	//-----boxer------ only hourly quest update 
@@ -7681,7 +7765,7 @@ BOOLEAN LetLuaHandleEarlyMorningEvents(UINT8 Init)
 //	lua_register(L, "CheckFact", l_CheckFact);	
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 //	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -7756,7 +7840,7 @@ BOOLEAN LetLuaHandleNPCSystemEvent( UINT32 uiEvent, UINT8 Init)
 	lua_register(L, "CheckFact", l_CheckFact);	
 	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -7793,7 +7877,6 @@ int i;
 SOLDIERTYPE *pSoldier;
 UINT8 ubTargetNPC;
 UINT32 ItemIndex;
-UINT32 Grido;
 INT8 bItemIn;
 BOOLEAN fPlayerMercsOnly;
 BOOLEAN bol = FALSE;
@@ -9107,6 +9190,28 @@ static int l_GetTimeQuestWasStarted (lua_State *L)
 	return 1;
 }
 
+static int l_GiveQuestRewardPoint(lua_State *L)
+{
+UINT8  n = lua_gettop(L);
+int i;
+INT16 sQuestSectorX = 0;
+INT16 sQuestSectorY = 0;
+INT8 bExpReward = 0;
+UINT8 bException = NO_PROFILE;
+
+	for (i= 1; i<=n; i++ )
+	{
+		if (i == 1 ) sQuestSectorX = lua_tointeger(L,i);
+		if (i == 2 ) sQuestSectorY = lua_tointeger(L,i);
+		if (i == 3 ) bExpReward = lua_tointeger(L,i);
+		if (i == 4 ) bException = lua_tointeger(L,i);
+	}
+	
+		GiveQuestRewardPoint( sQuestSectorX, sQuestSectorY, bExpReward, bException );
+
+return 0;
+}
+
 static int l_gubQuest (lua_State *L)
 {
 	UINT8  n = lua_gettop(L);
@@ -9131,6 +9236,25 @@ static int l_gubQuest (lua_State *L)
 	return 1;
 }
 
+static int l_SetgubQuest (lua_State *L)
+{
+	UINT8  n = lua_gettop(L);
+	int i = 0;
+	UINT8 quest = 0;
+	UINT8 stat = 0;
+
+	for (i= 1; i<=n; i++ )
+	{
+		if (i == 1 ) quest = lua_tointeger(L,i);
+		if (i == 2 ) stat = lua_tointeger(L,i);
+	}
+
+	if (stat == 0 || stat == 1 || stat == 2)
+		gubQuest[ quest ] = stat;
+	
+	return 0;
+}
+
 static int l_GetTacticalStatusEnemyInSector (lua_State *L)
 {
 	UINT8  n = lua_gettop(L);
@@ -10165,8 +10289,14 @@ static int l_StartQuest(lua_State *L)
 		if (i == 3 ) Y = lua_tointeger(L,i);
 	}
 
+	if (X == 0 || Y == 0 ) 
+	{
+		StartQuest( Quest, gWorldSectorX, gWorldSectorY );
+	}
+	else
+	{
 	StartQuest( Quest, X, Y );
-
+	}
 	return 0;
 }
 
@@ -10185,7 +10315,14 @@ static int l_EndQuest(lua_State *L)
 		if (i == 3 ) Y = lua_tointeger(L,i);
 	}
 
+	if (X == 0 || Y == 0 ) 
+	{
+		EndQuest( Quest, gWorldSectorX, gWorldSectorY );
+	}
+	else
+	{
 	EndQuest( Quest, X, Y );
+	}
 
 	return 0;
 }
@@ -10708,7 +10845,7 @@ BOOLEAN LetHandleLoyaltyChangeForNPCAction(UINT8 ubNPCProfileId , UINT8 Init)
 //	lua_register(L, "CheckFact", l_CheckFact);
 //	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 //	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))
@@ -10761,7 +10898,7 @@ BOOLEAN LuaHandleGlobalLoyaltyEvent( UINT8 ubEventType, INT16 sSectorX, INT16 sS
 //	lua_register(L, "CheckFact", l_CheckFact);
 //	lua_register(L, "CheckForMissingHospitalSupplies", l_CheckForMissingHospitalSupplies);
 //	lua_register(L, "CheckForKingpinsMoneyMissing", l_FunctionCheckForKingpinsMoneyMissing);
-	IniFunction(L);
+	IniFunction(L,TRUE);
 	IniGlobalGameSetting(L);
 	
 	if (luaL_dostring(L, buffer))

Strategic/LuaInitNPCs.h

@@ -64,6 +64,8 @@ extern BOOLEAN LetLuaHandleNPCSystemEvent( UINT32 uiEvent, UINT8 Init);
 extern BOOLEAN LuaCheckFact ( UINT16 usFact, UINT8 ubProfileID , UINT32 Init);
 extern BOOLEAN LuaHandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum , UINT8 InitFunction);
 
+extern BOOLEAN LuaInternalQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY, BOOLEAN fUpdateHistory, UINT32 Init );
+
 extern void IniLuaGlobal();
 
 extern BOOLEAN LoadLuaGlobalFromLoadGameFile( HWFILE hFile );

Strategic/Luaglobal.h

@@ -12,6 +12,7 @@ extern "C" {
 // --------------------------
 // WANNE: Should we enable lua scripting for different actions, or should we use "hardcoded" stuff instead?
 
+#define LUA_QUESTS							// Quests.lua
 #define LUA_INTERFACE_DIALOGUE				// InterfaceDialogue.lua
 #define LUA_EXPLOSION_CONTROL				// ExplosionControl.lua
 #define LUA_HANDLE_QUEST_CODE_ON_SECTOR		// Strategicmap.lua

Strategic/Quests.cpp

@@ -46,6 +46,8 @@
 
 #include "LuaInitNPCs.h"
 
+#include "Luaglobal.h"
+
 #define TESTQUESTS
 
 extern SOLDIERTYPE * gpSrcSoldier;
@@ -59,7 +61,7 @@ INT16	gsFoodQuestSectorY;
 
 extern void	GuaranteeAtLeastXItemsOfIndex( UINT8 ubArmsDealer, UINT16 usItemIndex, UINT8 ubHowMany );
 
-
+extern void GiveQuestRewardPoint( INT16 sQuestSectorX, INT16 sQuestsSectorY, INT8 bExpReward, UINT8 bException );
 
 
 void SetFactTrue( UINT16 usFact )
@@ -1319,6 +1321,9 @@ void StartQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY )
 
 void InternalStartQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY, BOOLEAN fUpdateHistory )
 {
+#ifdef LUA_QUESTS
+		LuaInternalQuest( ubQuest, sSectorX, sSectorY, fUpdateHistory, 1);
+#else
 	if ( gubQuest[ubQuest ] == QUESTNOTSTARTED )
 	{
 		gubQuest[ubQuest] = QUESTINPROGRESS;
@@ -1333,6 +1338,7 @@ void InternalStartQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY, BOOLEAN
 	{
 		gubQuest[ubQuest] = QUESTINPROGRESS;
 	}
+#endif
 }
 
 void EndQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY )
@@ -1342,6 +1348,11 @@ void EndQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY )
 
 void InternalEndQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY, BOOLEAN fUpdateHistory )
 {
+
+#ifdef LUA_QUESTS
+		LuaInternalQuest( ubQuest, sSectorX, sSectorY, fUpdateHistory, 0);
+#else
+
 	// SANDRO merc records - quests handled counter
 	if ( gubQuest[ubQuest] != QUESTDONE && fUpdateHistory ) // only public quests
 	{
@@ -1427,6 +1438,8 @@ void InternalEndQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY, BOOLEAN fU
 		gMercProfiles[ MADAME ].bNPCData2 = 0;
 	}
 	
+#endif
+	
 #ifdef JA2UB	
 	//if the quest is the FIX LAPTOP quest
 	if( ubQuest == QUEST_FIX_LAPTOP && gGameUBOptions.LaptopQuestEnabled == TRUE )

Strategic/Quests.h

@@ -67,6 +67,7 @@ enum Quests
 
 	QUEST_FREE_CHILDREN,	// 20
 	QUEST_LEATHER_SHOP_DREAM,
+	QUEST_ESCORT_SHANK = 22,
 
 #ifdef JA2UB
 	QUEST_DESTROY_MISSLES = 23,
@@ -74,8 +75,9 @@ enum Quests
 	QUEST_GET_RID_BLOODCATS_AT_BETTYS,
 	QUEST_FIND_ANTIQUE_MUSKET_FOR_RAUL,
 #else
-	QUEST_KILL_DEIDRANNA = 25
-
+	QUEST_23 = 23,
+	QUEST_24 = 24,
+	QUEST_KILL_DEIDRANNA = 25,
 #endif
 } ;
 /*

builddefines.h

@@ -5,7 +5,7 @@
 
 //----- Encyclopedia and Briefing room - by Jazz -----
 //#define ENABLE_ENCYCLOPEDIA		// WANNE: Be aware, encyclopedia uses a hugh amount of memory and the exe takes forever to start. There seems to be some memory leaks
-//#define ENABLE_BRIEFINGROOM		// WANNE: Briefing room seems to work better. Waiting for Jazz to create a mini mod to show this feature
+#define ENABLE_BRIEFINGROOM		// WANNE: Briefing room seems to work better. Waiting for Jazz to create a mini mod to show this feature
 //----- End encyclopedia and Briefing room - by Jazz -----
 
 // -----------------------------