New feature (by rftr): Arulco Rebel Command (ARC)

Improve you cities and overall campaign by choosing out of several upgrades

Requires GameDir >= r2613

For more info, see https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24884&start=0&

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

Laptop/DropDown.h

@@ -144,6 +144,8 @@ enum definedDropDowns
 	DROPDOWN_MILTIAWEBSITE_FILTER_RANK,
 	DROPDOWN_MILTIAWEBSITE_FILTER_ORIGIN,
 	DROPDOWN_MILTIAWEBSITE_FILTER_SECTOR,
+
+	DROPDOWN_REBEL_COMMAND_DIRECTIVE,
 };
 
 /*

Laptop/Laptop All.h

@@ -141,4 +141,5 @@
 #include "BriefingRoom_Data.h"
 #include "Encyclopedia_new.h"
 #include "Encyclopedia_Data_new.h"
+#include "Rebel Command.h"
 #endif

Laptop/finances.h

@@ -60,6 +60,7 @@ enum
 	WORKERS_TRAINED,		// Flugente: train workers
 	PROMOTE_MILITIA,		// Flugente: drill militia
 	MINI_EVENT,				// rftr: mini events
+	REBEL_COMMAND,			// rftr: rebel command
 	TEXT_NUM_FINCANCES
 };
 

Laptop/laptop.cpp

@@ -93,6 +93,7 @@
 	#include "MilitiaWebsite.h"				// added by Flugente
 	#include "Intelmarket.h"				// added by Flugente
 	#include "FacilityProduction.h"			// added by Flugente
+	#include "Rebel Command.h"
 #endif
 
 #include "connect.h"
@@ -1081,6 +1082,11 @@ INT32 EnterLaptop()
 			SetBookMark( PRODUCTION_BOOKMARK );
 		else
 			RemoveBookmark( PRODUCTION_BOOKMARK );
+
+		if (gGameExternalOptions.fRebelCommandEnabled && gubQuest[QUEST_FOOD_ROUTE] == QUESTDONE)
+			SetBookMark( REBELCOMMAND_BOOKMARK );
+		else
+			RemoveBookmark( REBELCOMMAND_BOOKMARK );
 	}
 
 	LoadLoadPending( );
@@ -1531,6 +1537,10 @@ void RenderLaptop()
 		case LAPTOP_MODE_FACILITY_PRODUCTION:
 			RenderFacilityProduction();
 			break;
+
+		case LAPTOP_MODE_REBEL_COMMAND:
+			RebelCommand::RenderWebsite();
+			break;
 	}
 
 	if( guiCurrentLaptopMode >= LAPTOP_MODE_WWW )
@@ -2011,6 +2021,10 @@ void EnterNewLaptopMode()
 		case LAPTOP_MODE_FACILITY_PRODUCTION:
 			EnterFacilityProduction();
 			break;
+
+		case LAPTOP_MODE_REBEL_COMMAND:
+			RebelCommand::EnterWebsite();
+			break;
 	}
 
 	// first time using webbrowser in this laptop session
@@ -2306,6 +2320,10 @@ void HandleLapTopHandles()
 		case LAPTOP_MODE_FACILITY_PRODUCTION:
 			HandleFacilityProduction();
 			break;
+
+		case LAPTOP_MODE_REBEL_COMMAND:
+			RebelCommand::HandleWebsite();
+			break;
 	}
 }
 
@@ -2908,6 +2926,10 @@ UINT32 ExitLaptopMode(UINT32 uiMode)
 		case LAPTOP_MODE_FACILITY_PRODUCTION:
 			ExitFacilityProduction();
 			break;
+
+		case LAPTOP_MODE_REBEL_COMMAND:
+			RebelCommand::ExitWebsite();
+			break;
 	}
 
 	if( ( uiMode != LAPTOP_MODE_NONE )&&( uiMode < LAPTOP_MODE_WWW ) )
@@ -4594,6 +4616,27 @@ void GoToWebPage(INT32 iPageId )
 			}
 		}
 		break;
+
+		case REBELCOMMAND_BOOKMARK:
+		{
+			guiCurrentWWWMode = LAPTOP_MODE_REBEL_COMMAND;
+			guiCurrentLaptopMode = LAPTOP_MODE_REBEL_COMMAND;
+
+			// do we have to have a World Wide Wait
+			if ( LaptopSaveInfo.fVisitedBookmarkAlready[REBELCOMMAND_BOOKMARK] == FALSE )
+			{
+				// reset flag and set load pending flag
+				LaptopSaveInfo.fVisitedBookmarkAlready[REBELCOMMAND_BOOKMARK] = TRUE;
+				fLoadPendingFlag = TRUE;
+			}
+			else
+			{
+				// fast reload
+				fLoadPendingFlag = TRUE;
+				fFastLoadFlag = TRUE;
+			}
+		}
+		break;
 	}
 
 #ifdef JA2UB	

Laptop/laptop.h

@@ -186,6 +186,8 @@ enum
 	
 	LAPTOP_MODE_AIM_MEMBERS_ARCHIVES_NEW,
 
+	LAPTOP_MODE_REBEL_COMMAND,
+
 	LAPTOP_MODE_MAX,
 };
 
@@ -255,6 +257,7 @@ enum{
 	MILITIAROSTER_BOOKMARK,		// added by Flugente
 	INTELMARKET_BOOKMARK,		// added by Flugente
 	PRODUCTION_BOOKMARK,		// added by Flugente
+	REBELCOMMAND_BOOKMARK,
 	TEXT_NUM_LAPTOP_BOOKMARKS
 };