Reworked Encyclopedia (by Moa)

- Access Encyclopedia from laptop screen - Encyclopedia can be enabled/disabled in the ja2_options.ini: ENCYCLOPEDIA - more infos: http://www.bears-pit.com/board/ubbthreads.php/topics/327315/Re_Ingame_Encyclopaedia.html#Post327315 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6550 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2026-07-22 13:40:22 +02:00 · 2013-10-31 11:42:05 +00:00
parent 5872d264f7
commit e7bd32dad9
39 changed files with 4125 additions and 54 deletions
@@ -1162,6 +1162,8 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.fEnableSoldierTooltipHealth		= iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_HEALTH", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipEnergy		= iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_ENERGY", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipMorale		= iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_MORALE", TRUE);
+	gGameExternalOptions.fEnableSoldierTooltipShock			= iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_SHOCK", TRUE);
+	gGameExternalOptions.fEnableSoldierTooltipSuppressionPoints = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipTraits		= iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_TRAITS", TRUE); // added by SANDRO
 	gGameExternalOptions.fEnableSoldierTooltipHelmet		= iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_HELMET", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipVest			= iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_VEST", TRUE);
@@ -1710,14 +1712,16 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.gBriefingRoom						= FALSE;
 #endif
 	
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
 	if (!is_networked)
 		gGameExternalOptions.gEncyclopedia					= iniReader.ReadBoolean("Laptop Settings", "ENCYCLOPEDIA", FALSE);
 	else
 		gGameExternalOptions.gEncyclopedia					= FALSE;
-#else
-	gGameExternalOptions.gEncyclopedia						= FALSE;
-#endif
+//#else
+//	gGameExternalOptions.gEncyclopedia						= FALSE;
+//#endif
+	// Moa: visibility of items in encyclopedia see ENC_ITEM_VISIBILITY_T
+	gGameExternalOptions.ubEncyclopediaItemMask	= (UINT8)iniReader.ReadInteger("Laptop Settings", "ENCYCLOPEDIA_ITEM_MASK", 1, 1, 4);

 	gGameExternalOptions.fDisableLaptopTransition			= iniReader.ReadBoolean("Laptop Settings", "DISABLE_LAPTOP_TRANSITION", FALSE);
 	gGameExternalOptions.fFastWWWSitesLoading				= iniReader.ReadBoolean("Laptop Settings", "FAST_WWW_SITES_LOADING", FALSE);
@@ -1885,7 +1889,7 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.gbMobileMilitiaMaxActiveMode				= (UINT8) iniReader.ReadInteger("Mobile Militia Training Settings","MOBILE_MILITIA_MAX_ACTIVE_MODE",0,0,255);
 	
 	//Moa: modifier for the maximum (make sure this is read after iMaxMilitiaPerSector)
-	gGameExternalOptions.gfpMobileMilitiaMaxActiveModifier			= iniReader.ReadFloat("Mobile Militia Training Settings","MOBILE_MILITIA_MAX_ACTIVE_MODIFIER", 0.5, 0.01, 10.0) * gGameExternalOptions.iMaxMilitiaPerSector;
+	gGameExternalOptions.gfpMobileMilitiaMaxActiveModifier			= iniReader.ReadFloat("Mobile Militia Training Settings","MOBILE_MILITIA_MAX_ACTIVE_MODIFIER", 0.5, 0.01f, 10.0f) * gGameExternalOptions.iMaxMilitiaPerSector;

 	gGameExternalOptions.guiCreateEachNHours						= iniReader.ReadInteger("Mobile Militia Training Settings","CREATE_MOBILE_MILITIA_SQUAD_EACH_N_HOURS",24, 1, 96);

@@ -711,6 +711,8 @@ typedef struct
 	BOOLEAN fEnableSoldierTooltipHealth;
 	BOOLEAN fEnableSoldierTooltipEnergy;
 	BOOLEAN fEnableSoldierTooltipMorale;
+	BOOLEAN fEnableSoldierTooltipShock;	//Moa: debug tooltip only
+	BOOLEAN fEnableSoldierTooltipSuppressionPoints; //Moa: debug tooltip only
 	BOOLEAN fEnableSoldierTooltipTraits; // added by SANDRO
 	BOOLEAN fEnableSoldierTooltipHelmet;
 	BOOLEAN fEnableSoldierTooltipVest;
@@ -1287,7 +1289,8 @@ typedef struct

 	BOOLEAN gBriefingRoom;
 	BOOLEAN gEncyclopedia;
-			
+	UINT8 ubEncyclopediaItemMask;					//Moa: visibility of items in encyclopedia, see ENC_ITEM_VISIBILITY_T
+
 	UINT8	ubMapItemChanceOverride;				//Madd: special map override, mostly for debugging
 	UINT8	ubNumPItems;							//Madd: set number of PItem files to be used - default 3
 	BOOLEAN	fUseXmlTileSets;						//Madd: move this variable here, it should be mod dependent
@@ -21,6 +21,7 @@ extern	CHAR16		zTrackingNumber[16];
 //		Keeps track of the saved game version.	Increment the saved game version whenever 
 //	you will invalidate the saved game file

+#define			ENCYCLOPEDIA_ITEM_VISIBILITY					148 // Moa: Items discovered during compain have to be saved.
 #define			TRAIT_RADIO_OPERATOR							147 // Flugente: new trait radio operator
 #define			BACKGROUNDS_FIX_UINT8							146 // Flugente: had to change usBackground-vars from UINT8 to UINT16
 #define			BACKGROUNDS										145 // Flugente: background feature
@@ -66,7 +67,7 @@ extern	CHAR16		zTrackingNumber[16];
 #define			AP100_SAVEGAME_DATATYPE_CHANGE					105	// Before this, we didn't have the 100AP structure changes
 #define			NIV_SAVEGAME_DATATYPE_CHANGE					102	// Before this, we used the old structure system

-#define			SAVE_GAME_VERSION								TRAIT_RADIO_OPERATOR
+#define			SAVE_GAME_VERSION								ENCYCLOPEDIA_ITEM_VISIBILITY

 //#define RUSSIANGOLD
 #ifdef __cplusplus
@@ -46,6 +46,7 @@
 	#include "Quests.h"
 	#include "strategicmap.h"
 	#include "Personnel.h"
+	#include "Encyclopedia_new.h"	//update encyclopedia item visibility when viewing that item
 #endif

 #include "Strategic Town Loyalty.h"
@@ -1668,6 +1669,8 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
 				{
 					PosX += WEAPONBOX_SIZE_X_NSGI;
 				}
+				//Moa: update encyclopedia item visibility when item gets displayed
+				EncyclopediaSetItemAsVisible( usItem, ENC_ITEM_DISCOVERED_NOT_INSPECTABLE );
 			}
 		}
 	}
@@ -1740,6 +1743,9 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
 					DisplayWrappedString( (UINT16)(PosX-1), wnameY, AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );

 				PosX += WEAPONBOX_SIZE_X;
+
+				//Moa: update encyclopedia item visibility when item gets displayed
+				EncyclopediaSetItemAsVisible( usItem, ENC_ITEM_DISCOVERED_NOT_INSPECTABLE );
 			}
 		}
 	}
@@ -22,6 +22,7 @@
 	#include "english.h"
 	// HEADROCK HAM 4
 	#include "input.h"
+	#include "Encyclopedia_new.h"	//update encyclopedia item visibility when viewing that item
 #endif


@@ -2444,6 +2445,9 @@ void DisplayItemNameAndInfo(UINT16 usPosY, UINT16 usIndex, UINT16 usBobbyIndex,
 	//Display Items description
 	LoadBRDesc(usIndex,sText);
 	DisplayWrappedString(BOBBYR_ITEM_DESC_START_X, usPosY, BOBBYR_ITEM_DESC_START_WIDTH, 2, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_ITEM_DESC_TEXT_COLOR, sText, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
+
+	//Moa: update encyclopedia item visibility when item gets displayed
+	EncyclopediaSetItemAsVisible( usIndex, ENC_ITEM_DISCOVERED_NOT_INSPECTABLE );
 }

 /*
@@ -1,19 +1,26 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "Laptop All.h"
 #else
-	#include "Laptop All.h"
-	#include "timer control.h"
+	//#include "Laptop All.h"
+	#include "Types.h"
+	#include "WCheck.h"
+	#include "Cursors.h"
 	#include "Debug.h"
+	#include "Utilities.h"
+	#include "timer control.h"
+	#include "Font Control.h"
 	#include "WordWrap.h"
 	#include "Encrypted File.h"
 	#include "email.h"
 	#include "Game Clock.h"
 	#include "Text.h"
 	#include "soldier profile type.h"
+	#include "laptop.h"
+	#include "Encyclopedia.h"	
+	#include "Encyclopedia_Data.h"
 #endif

-#include "Encyclopedia_Data.h"
-#include "Encyclopedia.h"
+


 // Link Images
@@ -261,7 +268,7 @@ void SelectEncyclopediaLocationButton(MOUSE_REGION * pRegion, INT32 iReason )
 		
 		IDPageEncyData = PAGEENCYCLOPEDIALOCATION; 
 		
-		if(!fFirstTimeInEncyclopedia) guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_LOCATION;	
+		if(!fFirstTimeInEncyclopedia) guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_DATA;	
 	}
 	else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
 	{
@@ -289,7 +296,7 @@ void SelectEncyclopediaCharacterButton(MOUSE_REGION * pRegion, INT32 iReason )
 		
 		IDPageEncyData = PAGEENCYCLOPEDIACHARACTER; 
 		
-		if(!fFirstTimeInEncyclopedia) guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_LOCATION;
+		if(!fFirstTimeInEncyclopedia) guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_DATA;
 	}
 	else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
 	{
@@ -316,7 +323,7 @@ void SelectEncyclopediaQuestsButton(MOUSE_REGION * pRegion, INT32 iReason )
 		
 		IDPageEncyData = PAGEENCYCLOPEDIAQUESTS; 
 		
-		if(!fFirstTimeInEncyclopedia) guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_LOCATION; 
+		if(!fFirstTimeInEncyclopedia) guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_DATA; 
 	}
 	else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
 	{
@@ -343,7 +350,7 @@ void SelectEncyclopediaInentoryButton(MOUSE_REGION * pRegion, INT32 iReason )
 		
 		IDPageEncyData = PAGEENCYCLOPEDIAINVENTORY; 
 		
-		if(!fFirstTimeInEncyclopedia) guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_LOCATION;
+		if(!fFirstTimeInEncyclopedia) guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_DATA;
 	}
 	else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
 	{
@@ -1,9 +1,11 @@
 #ifndef __ENCYCLOPEDIA_H
 #define __ENCYCLOPEDIA_H

-#include "Cursors.h"
-#include "soldier profile type.h"
+#include "Types.h"
 #include "Quests.h"
+#include "soldier profile type.h"
+
+
 enum
 {
 	ENCYCLOPEDIA_SLOGAN,
@@ -1,7 +1,7 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "Laptop All.h"
 #else
-	#include "Laptop All.h"
+	//#include "Laptop All.h"
 	#include "laptop.h"
 	#include "aim.h"
 	#include "Utilities.h"
@@ -10,13 +10,18 @@
 	#include "Text.h"
 	#include "Encrypted File.h"
 	#include "Soldier Profile.h"
+	#include "Sound Control.h"
+	#include "Campaign Types.h"
+	#include "Quests.h"
+	#include "Tactical Save.h"
+	#include "Encyclopedia_Data.h"
 #endif	

-#include "Encyclopedia_Data.h"
-#include "Encyclopedia.h"
-#include "Quests.h"

-#include "Tactical Save.h"
+
+
+
+

 #define MAX_FILTR_LOCATION_BUTTONS 11
 #define FILTR_INVENTORY_BUTTONS 5
@@ -125,12 +130,51 @@ void BackupBRandEncyclopedia ( ENCYCLOPEDIA_LOCATION *EncyBackup, ENCYCLOPEDIA_L

 BOOLEAN DisplayEncyclopediaLocationText()
 {
+	//DumpMemoryInfoIntoFile( "ExtremeMemoryDump.txt", FALSE );
 	return(TRUE);
 }

 void GameInitEncyclopediaLocation()
-{
+{/*
+	UINT32 typeSize = 0,total = 0;
+	CHAR buffer[150];

+	typeSize = sizeof (ENCYCLOPEDIA_LOCATION);
+	//backup data
+	total += sizeof(gEncyclopediaLocationDataBackup);
+	total += sizeof(gEncyclopediaProfilesDataBackup);
+	total += sizeof(gEncyclopediaInventoryDataBackup);
+	total += sizeof(gEncyclopediaOldProfilesDataBackup);
+	total += sizeof(gEncyclopediaQuestsDataBackup);
+	//actual data
+	total += sizeof(gEncyclopediaLocationData);
+	total += sizeof(gEncyclopediaProfilesData);
+	total += sizeof(gEncyclopediaInventoryData);
+	total += sizeof(gEncyclopediaOldProfilesData);
+	total += sizeof(gEncyclopediaQuestsData);
+	//save data
+	total += sizeof(saveEncyclopediaLocationData);
+	total += sizeof(saveEncyclopediaProfilesData);
+	total += sizeof(saveEncyclopediaInventoryData);
+	total += sizeof(saveEncyclopediaOldProfilesData);
+	total += sizeof(saveEncyclopediaQuestsData);
+	//working data
+	total += sizeof(gEncyclopediaDataTemp);
+	total /= 1024*1024;
+	sprintf(buffer,"Memory usage by Encyclopedia: %d MegaBytes\n",total);
+	OutputDebugString( buffer );
+	int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
+  
+	// Turn on leak-checking bit.
+	tmpFlag |= _CRTDBG_LEAK_CHECK_DF;
+  
+	// Turn off CRT block checking bit.
+	tmpFlag &= ~_CRTDBG_CHECK_CRT_DF;
+  
+	// Set flag to the new value.
+	_CrtSetDbgFlag( tmpFlag );
+
+	DumpMemoryInfoIntoFile( "ExtremeMemoryDump.txt", FALSE );*/
 }

 void ResetTemp()
@@ -153,7 +197,7 @@ UINT32 i,NUM_TEMP;
  else
 		NUM_TEMP = NUM_SECTOR;
 		
-  	for(i=0; i<NUM_SECTOR; i++)
+  	for(i=0; i<NUM_TEMP; i++)
 	{
 			gEncyclopediaDataTemp[i].uiIndex = i;
 			
@@ -796,7 +840,7 @@ void InitLocationFiltrButtons()
 void InitSoundButtons()
 {
 	UINT16	usPosY, i;
-	guiSoundButtonsImage =	LoadButtonImage("BriefingRoom\\BUTTONF.sti", -1,0,-1,1,-1 );
+	guiSoundButtonsImage =	LoadButtonImage("BriefingRoom\\BUTTONF.sti", BUTTON_NO_IMAGE, 0, BUTTON_NO_IMAGE, 1, BUTTON_NO_IMAGE );

 	usPosY = ENCYCLOPEDIA_LOCATION_FILTER_Y;
 	for(i=0; i<MAX_MISSION_BUTTONS; i++)
@@ -2,7 +2,7 @@
 #define __Encyclopedia_Data_H

 #include "Encyclopedia.h"
-#include "Encyclopedia_Data.h"
+//#include "Encyclopedia_Data.h"

 void GameInitEncyclopediaLocation();
 BOOLEAN EnterEncyclopediaLocation();
@@ -0,0 +1,15 @@
+#ifndef __Encyclopedia_Data_new_H
+#define __Encyclopedia_Data_new_H
+
+#include "Item Types.h"
+
+
+#define ENC_NUM_DATAPAGES MAXITEMS
+
+extern void GameInitEncyclopediaData_NEW(  );
+extern void HandleEncyclopediaData_NEW(  );
+extern void RenderEncyclopediaData_NEW(  );
+extern BOOLEAN EnterEncyclopediaData_NEW(  );
+extern BOOLEAN ExitEncyclopediaData_NEW(  );
+
+#endif
@@ -0,0 +1,462 @@
+/*TODOs:
+*remove every unneeded data (temp arrays, save arrays, backup arrays, data arrays, ec.)
+*Items:		- needs three state ini option to either be saved into file (any new item in inventory or sector stash will be added) 
+*				UINT8 array [MAX_ITEMS]: 0 not yet discovered (invisible), 1 in sector stash (unreachable) or on enemy, 2 seen at bobby ray, 3 seen in dealer inventory, 4 in sector stash (reachable) or solder inventory
+*			- or to gather data from all sector inventories (mark all as reachable, as there is no way to figure out in unloaded sectors), bobby rays current inventory, known dealers, soldier inventory
+*			- or to reveal all items from game (thats the old encyclopedia behavier)
+*			- make sure that this data gets updated only when accessing the laptop encyclopedia to avoid any impact on gameplay performance memory/speed (not possible for option 1!!)
+*Profiles:	- gather data from existing structs
+*Quests:	- gather data from existing structs
+*Locations	- gather data from exisitng structs
+*
+*only current DATA object is stored (graphic, names, description text, type ec..) and replaced when [next] or [previous] button was pressed. Stored in order to rerender dirty area if needed.
+* DONE: filters are handled on button press (gathering data in sequence and skip filtered items)
+*if possible do not read/write from files to get some data
+* DONE: reuse all graphics and layout from old Enc.
+*
+* PARTIALLY DONE: on button press: check if next/previous item exists to hide or disable (TBD) buttons and play bad beep sound (applys to clicks on filter buttons as well!)
+*
+*minimize usage of functions: default laptop www site has following functions:
+*	void GameInitXXX()											inits coords, validates data ec. everything that does not change (called when starting JA2/loading game/starting new game).
+*	void EnterXXX()												creates video objects, buttons, fasthelp texts, mousregions, ec. DOES NOT CALL RENDER!!
+*	void ExitXXX()												clean up everything, memory usage before enter and after exit should be equal
+*	void HandleXXX()											helper function gets called AFTER rendering by game loop. Can be used for animations, blinking and stuff (showing position of person on a map by blinking, simulate loading of site, animated zoom ec.)
+*	void RenderXXX()											obviously renders the site
+*	void ChangingXXXSubPage(UINT8)								prepares a change to a different subpage (called by BtnCallback)
+*	void BtnXXXButtonCallback(GUI_BUTTON *btn,INT32 reason)		callback for buttons / regions. If possible reuse these by adding some local swiches for readability of code (f.i.one for filters, one for next/previous).
+*/
+
+/// uncomment to use just graphic + mouseregion instead of real buttons. No sounds, no button states, just plain 'hyperlinks'.
+#define ENC_USE_BUTTONSYSTEM
+
+#ifdef PRECOMPILEDHEADERS
+	#include "Laptop All.h"
+#else
+	#include "Types.h"
+	#include "WCheck.h"
+	#include "DEBUG.H"
+	#include "GameSettings.h"
+	#include "laptop.h"//UI dimensions, mouse regions
+	#include "Utilities.h"//file names
+	#include "vobject.h"//video objects
+	#include "Utils/Cursors.h"
+	#include "Text.h"//button text
+#ifdef ENC_USE_BUTTONSYSTEM
+	#include "Button System.h"
+#else
+	#include "WordWrap.h"//centered text
+#endif
+	#include "Encyclopedia_new.h"
+	//#include "Encrypted File.h"
+	//#include "Soldier Profile.h"
+	//#include "Sound Control.h"
+	//#include "Campaign Types.h"
+	//#include "Quests.h"
+	//#include "Tactical Save.h"
+	//#include "Encyclopedia_Data_new.h"
+#endif	
+
+/** @defgroup ENCYCLOPEDIA Encyclopedia
+* Encyclopedia shows discovered places, characters, known items and quests.
+*/
+
+/** @ingroup ENCYCLOPEDIA
+* @file
+* Main page of Encyclopedia.
+*/
+
+///@{ background images
+UINT32 guiEncyclopediaBG;
+UINT32 guiEncyclopediaAimLogo;
+///@}
+
+///@{ buttons, graphics and regions for main page
+#ifdef ENC_USE_BUTTONSYSTEM
+INT32 giEncyclopediaBtn[ ENC_NUM_SUBPAGES ];
+INT32 giEncyclopediaBtnImage;
+#else
+MOUSE_REGION gEncyclopediaBtnRegions[ ENC_NUM_SUBPAGES ];
+UINT32 guiEncyclopediaBtnImage;
+#endif
+#define ENC_BTN_GAP 6
+#define ENC_AIMLOGO_GAP_TOP 20
+#define ENC_AIMLOGO_GAP_BOTTOM 40
+///@}
+
+ENC_SUBPAGE_T geENC_SubPage;	///< Current sub page
+
+///////
+//prototypes
+
+#ifdef ENC_USE_BUTTONSYSTEM
+void BtnEncyclopedia_newSelectDataPageBtnCallBack ( GUI_BUTTON *btn, INT32 reason );
+#else
+void BtnEncyclopedia_newSelectDataPageRegionCallBack( MOUSE_REGION * pRegion, INT32 iReason );
+#endif
+///////
+//functions
+
+/** @defgroup ENC_MAIN Main page
+* Encyclopedia main page global functions.
+* @ingroup ENCYCLOPEDIA
+* @{*/
+/**
+* Checks for all required graphic files.
+*
+* Called when a new game is started (guiCurrentScreen == 0), entering new game screen/loading game from main menu (guiCurrentScreen == MAINMENU_SCREEN) and quitting game (guiCurrentScreen == MSG_BOX_SCREEN).
+* Checks for all needed graphic files. Initializes button and image handles.
+* Shows error message and deactivates Encyclopedia if a file is missing.
+* @todo show a msg to user. MsgBox is crashing JA2 because of multithread. Maybe pause game?
+*/
+void GameInitEncyclopedia_NEW()
+{
+	// initialize gui handles
+#ifdef ENC_USE_BUTTONSYSTEM
+	memset( giEncyclopediaBtn, BUTTON_NO_SLOT, sizeof(giEncyclopediaBtn) );
+	giEncyclopediaBtnImage = BUTTON_NO_IMAGE;
+#else
+#endif
+	// check for files only on start of JA2
+	CHECKV( guiCurrentScreen == 0 && gGameExternalOptions.gEncyclopedia );
+
+	if ( !FileExists( "ENCYCLOPEDIA\\encyclopediabackground.sti" ) )
+	{
+		goto error;
+	}
+	if ( !FileExists( "ENCYCLOPEDIA\\encyclopedialogoaim.sti" ) )
+	{
+		goto error;
+	}
+	if ( !FileExists( "ENCYCLOPEDIA\\CONTENTBUTTON.STI" ) )
+	{
+		goto error;
+	}
+	return;
+error:
+	gGameExternalOptions.gEncyclopedia = FALSE;
+	DebugMsg( TOPIC_JA2, DBG_LEVEL_1, "Ja2 Error: GRAPHIC FILE MISSING. Encyclopedia has been deactivated." );
+	//MessageBox( NULL, "GRAPHIC FILE MISSING.Encyclopedia has been deactivated.", "Ja2 Error!", MB_OK );
+	//SGP_THROW( "Ja2 Error: GRAPHIC FILE MISSING. Encyclopedia has been deactivated." );
+}
+
+/**
+* Helper function gets called AFTER rendering by game loop. 
+* Can be used to poll keyboard or mouse events.
+* Can also be used for animations (e.g. showing blinking position of person on a map, simulate loading of commercials, animated zoom ec.).
+*/
+void HandleEncyclopedia_NEW()
+{
+}
+
+/**
+* Creates video objects, buttons, fasthelp texts, mousregions.
+* Called when entering encyclopedia web page in laptop. Prepares main page of Encyclopedia.
+* @return FALSE on error. TRUE on success.
+* @see ExitEncyclopedia_NEW()
+*/
+BOOLEAN EnterEncyclopedia_NEW(  )
+{
+	VOBJECT_DESC	VObjectDesc;
+	HVOBJECT hVObject;
+	UINT16 buttonSizeX, buttonSizeY, logoBottomY;
+
+	//error if not enabled
+	CHECKF( gGameExternalOptions.gEncyclopedia );
+	//error if the laptop mode does not match encyclopedia
+	CHECKF( LAPTOP_MODE_ENCYCLOPEDIA == guiCurrentLaptopMode );
+
+	SetBookMark( ENCYCLOPEDIA_BOOKMARK );//bookmark should be allways set, just in case it is not.
+	//////
+	// load the background graphic
+	VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
+	FilenameForBPP( "ENCYCLOPEDIA\\encyclopediabackground.sti", VObjectDesc.ImageFile );
+	CHECKF( AddVideoObject( &VObjectDesc, &guiEncyclopediaBG ) );
+	//////
+	// load AIM Logo
+	VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
+	FilenameForBPP( "ENCYCLOPEDIA\\encyclopedialogoaim.sti", VObjectDesc.ImageFile );
+	CHECKF( AddVideoObject( &VObjectDesc, &guiEncyclopediaAimLogo ) );
+	// get bottom Y of logo from image
+	GetVideoObject( &hVObject, guiEncyclopediaAimLogo );
+	CHECKF(hVObject);CHECKF(hVObject->pETRLEObject);
+	logoBottomY = hVObject->pETRLEObject->usHeight + LAPTOP_SCREEN_WEB_UL_Y + ENC_AIMLOGO_GAP_TOP;
+
+#ifdef ENC_USE_BUTTONSYSTEM//use button system
+	//////
+	// load button graphic for the data pages
+	giEncyclopediaBtnImage = LoadButtonImage( "ENCYCLOPEDIA\\CONTENTBUTTON.STI", BUTTON_NO_IMAGE, 0, BUTTON_NO_IMAGE , 0, BUTTON_NO_IMAGE );
+	if ( giEncyclopediaBtnImage == BUTTON_NO_IMAGE )
+		return FALSE;
+	buttonSizeX = GetWidthOfButtonPic( giEncyclopediaBtnImage, 0 );
+	buttonSizeY = GetHeightOfButtonPic( giEncyclopediaBtnImage, 0 );
+	//////
+	// create buttons and set user data
+	for ( UINT8 i = 0; i < ENC_NUM_SUBPAGES; i++ )
+	{
+		giEncyclopediaBtn[ i ] = CreateIconAndTextButton( giEncyclopediaBtnImage,
+			pMenuStrings[ i ], FONT12ARIAL, FONT_FCOLOR_WHITE, DEFAULT_SHADOW, FONT_FCOLOR_WHITE, DEFAULT_SHADOW, TEXT_CJUSTIFIED,
+			LAPTOP_SCREEN_UL_X + (LAPTOP_SCREEN_WIDTH)/2 - buttonSizeX/2,//upper left x: center of laptop screen - 1/2 buttonsize
+			logoBottomY + ENC_AIMLOGO_GAP_BOTTOM + i * (ENC_BTN_GAP + buttonSizeY),//upper left y: below logo + logo gap + previous buttons and button gaps
+			BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
+			DEFAULT_MOVE_CALLBACK, BtnEncyclopedia_newSelectDataPageBtnCallBack );
+		CHECKF( giEncyclopediaBtn[ i ] >= 0 );
+		SetButtonCursor( giEncyclopediaBtn[ i ], CURSOR_LAPTOP_SCREEN );
+		MSYS_SetBtnUserData( giEncyclopediaBtn[ i ], 1, i + 1 );
+		GetButtonPtr( giEncyclopediaBtn[ i ] )->fShiftImage = TRUE;
+		//SpecifyButtonSoundScheme( giEncyclopediaDataBtn[ i ], BUTTON_SOUND_SCHEME_BIGSWITCH3 );
+	}
+#else
+	//////
+	// load button graphic for the data pages
+	VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
+	FilenameForBPP( "ENCYCLOPEDIA\\CONTENTBUTTON.STI", VObjectDesc.ImageFile );
+	CHECKF( AddVideoObject( &VObjectDesc, &guiEncyclopediaBtnImage ) );
+	//////
+	// create mouse regions for data buttons and set user data
+	GetVideoObject( &hVObject, guiEncyclopediaBtnImage );
+	CHECKF(hVObject);CHECKF(hVObject->pETRLEObject);
+	buttonSizeX = hVObject->pETRLEObject->usWidth;//get width of buttons from image
+	buttonSizeY = hVObject->pETRLEObject->usHeight;//get heigth of buttons from image
+
+	for ( UINT8 i = 0; i < ENC_NUM_SUBPAGES; i++ )
+	{
+		MSYS_DefineRegion( &gEncyclopediaBtnRegions[i],
+			LAPTOP_SCREEN_UL_X + (LAPTOP_SCREEN_WIDTH)/2 - buttonSizeX/2,//upper left x: center of laptop screen - 1/2 buttonsize
+			logoBottomY + ENC_AIMLOGO_GAP_BOTTOM + i * (ENC_BTN_GAP + buttonSizeY),//upper left y: below logo + logo gap + previous buttons and button gaps
+			LAPTOP_SCREEN_UL_X + (LAPTOP_SCREEN_WIDTH)/2 + buttonSizeX/2,//lower right x: center of laptop screen + 1/2 buttonsize
+			logoBottomY + ENC_AIMLOGO_GAP_BOTTOM + buttonSizeY + i * (ENC_BTN_GAP + buttonSizeY),//lower right y: below logo + logo gap + button height + previous buttons and button gaps
+			MSYS_PRIORITY_HIGH,//priority
+			CURSOR_WWW,//cursor
+			MSYS_NO_CALLBACK,//moveCB
+			BtnEncyclopedia_newSelectDataPageRegionCallBack);
+		MSYS_SetRegionUserData( &gEncyclopediaBtnRegions[i], 0, i + 1 );
+		CHECKF( MSYS_AddRegion( &gEncyclopediaBtnRegions[i] ) );
+	}
+#endif
+	return TRUE;
+}
+
+/**
+* Destroys video objects, buttons, fasthelp texts, mousregions.
+* Called on exit of encyclopedia main page in laptop.
+* @return FALSE on error. TRUE on success.
+* @see EnterEncyclopedia_NEW()
+*/
+BOOLEAN ExitEncyclopedia_NEW(  )
+{
+	BOOLEAN success = TRUE;
+	
+	//error if not enabled
+	success &= !gGameExternalOptions.gEncyclopedia;
+	//error if the laptop mode does not match encyclopedia
+	success &= !( LAPTOP_MODE_ENCYCLOPEDIA == guiPreviousLaptopMode );
+	// destroy background graphic
+	success &= DeleteVideoObjectFromIndex( guiEncyclopediaBG );
+	// destroy AIM logo
+	success &= DeleteVideoObjectFromIndex( guiEncyclopediaAimLogo );
+
+#ifdef ENC_USE_BUTTONSYSTEM//use button system
+	// destroy buttons
+	for ( UINT8 i = 0; i < ENC_NUM_SUBPAGES; i++ )
+		if ( giEncyclopediaBtn[ i ] != BUTTON_NO_SLOT )
+		{
+			RemoveButton( giEncyclopediaBtn[ i ] );
+			giEncyclopediaBtn[ i ] = BUTTON_NO_SLOT;
+		}
+		else
+			success = FALSE;
+	// destroy button graphic
+	if ( giEncyclopediaBtnImage != BUTTON_NO_IMAGE )
+	{
+		UnloadButtonImage( giEncyclopediaBtnImage );
+		giEncyclopediaBtnImage = BUTTON_NO_IMAGE;
+	}
+	else
+		success = FALSE;
+#else
+	// destroy button graphic
+	success &= DeleteVideoObjectFromIndex( guiEncyclopediaBtnImage );
+	// destroy mouseregions for buttons
+	for (UINT8 i = 0; i < ENC_NUM_SUBPAGES; i++)
+		MSYS_RemoveRegion( &gEncyclopediaBtnRegions[i] );
+#endif
+	return success;
+}
+
+/**
+* Renders main page of encyclopedia.
+*/
+void RenderEncyclopedia_NEW(  )
+{
+	HVOBJECT hVObject;
+	UINT16 x,y;
+
+	CHECKV( gGameExternalOptions.gEncyclopedia );
+
+	// render background
+	x = LAPTOP_SCREEN_UL_X;
+	y = LAPTOP_SCREEN_WEB_UL_Y;
+	CHECKV( BltVideoObjectFromIndex ( FRAME_BUFFER, guiEncyclopediaBG, 0, x, y, VO_BLT_SRCTRANSPARENCY, NULL ) );
+
+	// render AIM logo
+	GetVideoObject( &hVObject, guiEncyclopediaAimLogo );
+	CHECKV(hVObject);CHECKV(hVObject->pETRLEObject);
+	x = LAPTOP_SCREEN_UL_X + (LAPTOP_SCREEN_WIDTH - hVObject->pETRLEObject->usWidth)/2;	//Center of Laptop screen
+	y = LAPTOP_SCREEN_WEB_UL_Y + ENC_AIMLOGO_GAP_TOP;									//20 pixel below title bar of www
+	CHECKV( BltVideoObjectFromIndex( FRAME_BUFFER, guiEncyclopediaAimLogo, 0, x, y, VO_BLT_SRCTRANSPARENCY, NULL ) );
+
+	// render Buttons for Data pages
+#ifdef ENC_USE_BUTTONSYSTEM
+	RenderButtons();
+#else
+	for ( UINT8 i = 0; i < ENC_NUM_SUBPAGES; i++ )
+	{ 
+		x = gEncyclopediaBtnRegions[ i ].RegionTopLeftX;
+		y = gEncyclopediaBtnRegions[ i ].RegionTopLeftY;
+		//Btn graphic
+		CHECKV( BltVideoObjectFromIndex( FRAME_BUFFER, guiEncyclopediaBtnImage, 0, x, y, VO_BLT_SRCTRANSPARENCY, NULL ) );
+		//Btn text
+		y += (gEncyclopediaBtnRegions[ i ].RegionBottomRightY - y)/2 - GetFontHeight( FONT12ARIAL )/2;
+		DrawTextToScreen( pMenuStrings[ i ], x, y, (UINT16)gEncyclopediaBtnRegions[ i ].RegionBottomRightX - x, FONT12ARIAL, FONT_FCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
+	}
+#endif
+	// finish render
+	CHECKV ( RenderWWWProgramTitleBar() );
+	InvalidateRegion(LAPTOP_SCREEN_UL_X,LAPTOP_SCREEN_WEB_UL_Y,LAPTOP_SCREEN_LR_X,LAPTOP_SCREEN_WEB_LR_Y);	
+}
+
+/**
+* @brief Sets an item as visible in encyclopedia.
+* Unsetting single items is not allowed by design. However you can reset all items as not discovered by using \ref EncyclopediaInitItemsVisibility().
+* If the visibility parameter is less strict then the value assigned to gbEncyclopediaData_ItemVisible no action is taken.
+* Usage:
+* Whenever an item is viewed in stash, on enemies (steal menu, enemy tooltip), dealers inventory ec. call this function.
+* @param itemIndex Index of INVTYPE Item[MAXITEMS]
+* @param visibility see \ref ENC_ITEM_VISIBILITY_T. Do not take external options into account when choosing that value, those are handled when displaying the items in encyclopedia.
+*/
+void EncyclopediaSetItemAsVisible( UINT16 itemIndex, ENC_ITEM_VISIBILITY_T visibility )
+{
+	CHECKV(gGameExternalOptions.gEncyclopedia);
+	CHECKV(itemIndex < MAXITEMS);
+
+	if( gbEncyclopediaData_ItemVisible[ itemIndex ] < visibility )
+		gbEncyclopediaData_ItemVisible[ itemIndex ] = visibility;
+}
+
+/**
+* @brief Sets all items as not discovered.
+* Called during loading of old saveGame.
+*/
+void EncyclopediaInitItemsVisibility()
+{
+	memset( gbEncyclopediaData_ItemVisible, ENC_ITEM_NOT_DISCOVERED, MAXITEMS*sizeof(UINT8) );
+}
+
+/**
+* @brief Saves Item visibility array to file.
+*
+* @return TRUE if data is written.
+*/
+BOOLEAN SaveEncyclopediaItemVisibility( HWFILE hFile )
+{
+	UINT32 bytesWritten;
+
+	CHECKF( FileWrite( hFile, gbEncyclopediaData_ItemVisible, MAXITEMS, &bytesWritten ) );
+
+	return (TRUE);
+}
+
+/**
+* @brief Loads item visibility array from file.
+*
+* @return TRUE if data is read.
+*/
+BOOLEAN LoadEncyclopediaItemVisibility( HWFILE hFile )
+{
+	UINT32 bytesRead;
+
+	CHECKF( FileRead( hFile, gbEncyclopediaData_ItemVisible, MAXITEMS, &bytesRead) );
+
+	return (TRUE);
+}
+///@}
+
+/**
+* @brief Prepares a change to a different subpage.
+* Subpages currently available: Loactions, Characters, Items, Quests.
+* @param ubSubPageNumber 1 to ENC_NUM_SUBPAGES (4)
+* @see ENC_SUBPAGE_T
+*/
+void ChangingEncyclopediaSubPage( UINT8 ubSubPageNumber )
+{
+	CHECKV( gGameExternalOptions.gEncyclopedia );
+	AssertGT(ubSubPageNumber,0);
+	AssertLE(ubSubPageNumber, ENC_NUM_SUBPAGES);
+
+	fLoadPendingFlag = TRUE;//tell laptop it should load another page
+	fConnectingToSubPage = TRUE;//faster loading on same web site
+	fFastLoadFlag = FALSE;//accessing some data subpage, so do not load too fast
+	geENC_SubPage = static_cast<ENC_SUBPAGE_T>( ubSubPageNumber );
+}
+
+//////////////
+//Callback functions
+#ifdef ENC_USE_BUTTONSYSTEM//use button system
+void BtnEncyclopedia_newSelectDataPageBtnCallBack( GUI_BUTTON *btn, INT32 reason )
+{
+	if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
+	{
+		btn->uiFlags |= BUTTON_CLICKED_ON;
+		InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
+	}
+	if( reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
+	{
+		if( btn->uiFlags & BUTTON_CLICKED_ON)
+		{
+			btn->uiFlags &= (~BUTTON_CLICKED_ON );
+			if ( MSYS_GetBtnUserData( btn, 1 ) == ENC_MAINPAGE )
+				guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA;
+			else
+			{
+				ChangingEncyclopediaSubPage( (UINT8)MSYS_GetBtnUserData( btn, 1 ) );
+				guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_DATA;
+			}
+			InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
+		}
+	}
+	if( reason & MSYS_CALLBACK_REASON_LOST_MOUSE )
+	{
+		btn->uiFlags &= (~BUTTON_CLICKED_ON );
+		InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
+	}
+}
+#else
+/**
+* @brief Callback for data page buttons.
+* Userdata at index 0 is used to determine which button is pressed.
+*/
+void BtnEncyclopedia_newSelectDataPageRegionCallBack( MOUSE_REGION * pRegion, INT32 iReason )
+{
+	CHECKV( gGameExternalOptions.gEncyclopedia );
+	if (iReason & MSYS_CALLBACK_REASON_INIT)
+	{
+	}
+	else if(iReason & MSYS_CALLBACK_REASON_LBUTTON_UP)
+	{
+		UINT8 selectedButton = (UINT8)MSYS_GetRegionUserData( pRegion, 0 );
+
+		if( selectedButton == 0 )
+		{
+			guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA;
+		}
+		else if( selectedButton > 0 && selectedButton <= ENC_NUM_SUBPAGES )
+		{
+			ChangingEncyclopediaSubPage ( selectedButton );
+			guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA_DATA;
+		}
+	}
+	else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
+	{
+	}
+}
+#endif
@@ -0,0 +1,37 @@
+#ifndef __Encyclopedia_new_H
+#define __Encyclopedia_new_H
+
+/// For switching between data sub pages.
+enum ENC_SUBPAGE_T {
+	ENC_MAINPAGE = 0,
+	ENC_LOCATIONS,
+	ENC_CHARACTERS,
+	ENC_ITEMS,
+	ENC_QUESTS//4
+};
+#define ENC_NUM_SUBPAGES ENC_QUESTS
+extern ENC_SUBPAGE_T geENC_SubPage;//current subpage
+
+/// values for \ref gbEncyclopediaData_ItemVisible, can be set by using \ref EncyclopediaSetItemAsVisible(). During campain those values can only be increased, never decreased. If you want to reset to 0 use \ref EncyclopediaInitItemsVisibility instead.
+typedef enum ENC_ITEM_VISIBILITY_T {
+ENC_ITEM_NOT_DISCOVERED = 0,			///< item is not visible in encyclopedia
+ENC_ITEM_DISCOVERED_NOT_REACHABLE,		///< item is visible in encyclopedia if external option allows not reachable items to be added as discovered. example: item in sector stash but is not reachable, item has been seen on enemy soldier.
+ENC_ITEM_DISCOVERED_NOT_INSPECTABLE,	///< item is visible in encyclopedia if external option allows not inspectable items to be added as discovered. Item is potentially reachable, but can not be inspected. example: item got displayed in bobby rays screen, item got displayed in merc/aim laptop screen.
+ENC_ITEM_DISCOVERED_INSPECTABLE,		///< item is visible in encyclopedia if external option allows inspectable items to be added as discovered. Item is potentially reachable and can be inspected. example: discovering from a dealers inventory, discovering from sector stash.
+ENC_ITEM_DISCOVERED						///< item is visible in encyclopedia. Item can be fully inspected. example: item is in merc inventory.
+};
+extern UINT8 gbEncyclopediaData_ItemVisible[];
+extern void EncyclopediaInitItemsVisibility();
+extern void EncyclopediaSetItemAsVisible( UINT16 itemIndex, ENC_ITEM_VISIBILITY_T visibility );
+
+extern BOOLEAN LoadEncyclopediaItemVisibility( HWFILE hFile );
+extern BOOLEAN SaveEncyclopediaItemVisibility( HWFILE hFile );
+
+extern void GameInitEncyclopedia_NEW(  );
+extern void HandleEncyclopedia_NEW(  );
+extern void RenderEncyclopedia_NEW(  );
+extern BOOLEAN EnterEncyclopedia_NEW(  );
+extern BOOLEAN ExitEncyclopedia_NEW(  );
+
+
+#endif
@@ -138,5 +138,8 @@
 #include "ShopKeeper Interface.h"
 #include "Cheats.h"
 #include "GameVersion.h"
-
+#include "Encyclopedia.h"
+#include "Encyclopedia_Data.h"
+#include "Encyclopedia_new.h"
+#include "Encyclopedia_Data_new.h"
 #endif
@@ -434,6 +434,14 @@
 				RelativePath=".\Encyclopedia_Data.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Encyclopedia_Data_new.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Encyclopedia_new.h"
+				>
+			</File>
 			<File
 				RelativePath=".\files.h"
 				>
@@ -740,6 +748,14 @@
 				RelativePath=".\Encyclopedia_Data.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\Encyclopedia_Data_new.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Encyclopedia_new.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\files.cpp"
 				>
@@ -47,6 +47,8 @@
    <ClInclude Include="email.h" />
    <ClInclude Include="Encyclopedia.h" />
    <ClInclude Include="Encyclopedia_Data.h" />
+    <ClInclude Include="Encyclopedia_Data_new.h" />
+    <ClInclude Include="Encyclopedia_new.h" />
    <ClInclude Include="files.h" />
    <ClInclude Include="finances.h" />
    <ClInclude Include="florist Cards.h" />
@@ -124,6 +126,8 @@
    <ClCompile Include="email.cpp" />
    <ClCompile Include="Encyclopedia.cpp" />
    <ClCompile Include="Encyclopedia_Data.cpp" />
+    <ClCompile Include="Encyclopedia_Data_new.cpp" />
+    <ClCompile Include="Encyclopedia_new.cpp" />
    <ClCompile Include="files.cpp" />
    <ClCompile Include="finances.cpp" />
    <ClCompile Include="florist Cards.cpp" />
@@ -234,6 +234,12 @@
    <ClInclude Include="DropDown.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="Encyclopedia_new.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Encyclopedia_Data_new.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="aim.cpp">
@@ -479,5 +485,11 @@
    <ClCompile Include="DropDown.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="Encyclopedia_new.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Encyclopedia_Data_new.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
 </Project>
@@ -83,6 +83,8 @@
 	#include "Strategic Status.h"
 	#include "Arms Dealer Init.h"
 	#include "GameSettings.h"
+	#include "Encyclopedia_new.h"
+	#include "Encyclopedia_Data_new.h"
 #endif

 #include "connect.h"
@@ -790,8 +792,10 @@ UINT32 LaptopScreenInit()
 	GameInitPersonnel();
 	
 	//legion
-	GameInitEncyclopedia();
-	GameInitEncyclopediaLocation();
+/*	GameInitEncyclopedia();
+	GameInitEncyclopediaLocation();*/
+	GameInitEncyclopedia_NEW();
+	GameInitEncyclopediaData_NEW();
 	GameInitBriefingRoom();
 	GameInitBriefingRoomEnter();

@@ -1240,11 +1244,13 @@ void RenderLaptop()
 		break;
 		
 		case LAPTOP_MODE_ENCYCLOPEDIA: //LEGION
-			RenderEncyclopedia();
+//			RenderEncyclopedia();
+			RenderEncyclopedia_NEW();
 			break;
 			
-		case LAPTOP_MODE_ENCYCLOPEDIA_LOCATION:
-			RenderEncyclopediaLocation(FALSE);
+		case LAPTOP_MODE_ENCYCLOPEDIA_DATA:
+//			RenderEncyclopediaLocation(FALSE);
+			RenderEncyclopediaData_NEW();
 			break;
 			
 		case LAPTOP_MODE_BRIEFING_ROOM_PAGE:
@@ -1559,7 +1565,7 @@ void EnterNewLaptopMode()
 		if( gLaptopProgramStates[ LAPTOP_PROGRAM_WEB_BROWSER ] == LAPTOP_PROGRAM_MINIMIZED )
 		{
 		
-			if ( guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA_LOCATION || guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA )
+			if ( guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA_DATA || guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA )
 			{
 				guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA;
 			}
@@ -1656,11 +1662,13 @@ void EnterNewLaptopMode()
 	{
 		//legion
 		case LAPTOP_MODE_ENCYCLOPEDIA:
-			EnterEncyclopedia();
+//			EnterEncyclopedia();
+			EnterEncyclopedia_NEW();
 			break;
 			
-		case LAPTOP_MODE_ENCYCLOPEDIA_LOCATION:
-			EnterEncyclopediaLocation();
+		case LAPTOP_MODE_ENCYCLOPEDIA_DATA:
+//			EnterEncyclopediaLocation();
+			EnterEncyclopediaData_NEW();
 			break;
 			
 		case LAPTOP_MODE_BRIEFING_ROOM_PAGE:
@@ -1859,11 +1867,13 @@ void HandleLapTopHandles()
 	{
 		//legion
 		case LAPTOP_MODE_ENCYCLOPEDIA:
-			HandleEncyclopedia();
+//			HandleEncyclopedia();
+			HandleEncyclopedia_NEW();
 			break; 
 			
-		case LAPTOP_MODE_ENCYCLOPEDIA_LOCATION:
-			HandleEncyclopediaLocation();
+		case LAPTOP_MODE_ENCYCLOPEDIA_DATA:
+//			HandleEncyclopediaLocation();
+			HandleEncyclopediaData_NEW();
 			break; 				

 		case LAPTOP_MODE_BRIEFING_ROOM_PAGE:
@@ -2397,12 +2407,14 @@ UINT32 ExitLaptopMode(UINT32 uiMode)
 	{
 	
 		case LAPTOP_MODE_ENCYCLOPEDIA:
-			ExitEncyclopedia();
+			ExitEncyclopedia_NEW();
+//			ExitEncyclopedia();
 			//InitEncyklopediaBool();
 			break;			
 			
-		case LAPTOP_MODE_ENCYCLOPEDIA_LOCATION:
-			ExitEncyclopediaLocation();
+		case LAPTOP_MODE_ENCYCLOPEDIA_DATA:
+//			ExitEncyclopediaLocation();
+			ExitEncyclopediaData_NEW();
 			break;
 		
 		case LAPTOP_MODE_BRIEFING_ROOM_PAGE:
@@ -5621,7 +5633,7 @@ void SetCurrentToLastProgramOpened( void )
 		break;
 		case( LAPTOP_PROGRAM_WEB_BROWSER ):
 		// last www mode
-			if ( guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA_LOCATION || guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA )
+			if ( guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA_DATA || guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA )
 			{
 				guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA;
 			}
@@ -141,8 +141,10 @@ enum
 	LAPTOP_MODE_BOBBYR_SHIPMENTS,
 	
 	//ENCYCLOPEDIA
-	LAPTOP_MODE_ENCYCLOPEDIA,
-	LAPTOP_MODE_ENCYCLOPEDIA_LOCATION,
+	LAPTOP_MODE_ENCYCLOPEDIA,//main page
+	LAPTOP_MODE_ENCYCLOPEDIA_DATA,//subpage for locations, items, profiles or quests
+
+	//BRIEFING ROOM
 	LAPTOP_MODE_BRIEFING_ROOM_PAGE,
 	LAPTOP_MODE_BRIEFING_ROOM,
 	LAPTOP_MODE_BRIEFING_ROOM_ENTER,
@@ -112,6 +112,7 @@
 	// HEADROCK HAM 3.6: Yet another include, goddammit
 	#include "Town Militia.h"
 	#include "Items.h"
+	#include "Encyclopedia_new.h"
 #endif

 #include		"BobbyR.h"
@@ -4143,6 +4144,15 @@ if( !SaveNewEmailDataToSaveGameFile( hFile ) )
 	#endif	

 	}
+
+	if ( !SaveEncyclopediaItemVisibility( hFile ) )
+	{
+		ScreenMsg( FONT_MCOLOR_WHITE, MSG_ERROR, L"ERROR writing Encyclopedia item visibility" );
+		goto FAILED_TO_SAVE;
+	#ifdef JA2BETAVERSION
+		SaveGameFilePosition( FileGetPos( hFile), "Encyclopedia item visibility" );
+	#endif
+	}
 //Close the saved game file
 	FileClose( hFile );

@@ -5753,6 +5763,21 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )

 	}

+	if ( guiCurrentSaveGameVersion >= ENCYCLOPEDIA_ITEM_VISIBILITY )
+	{
+		// no progress bar change, loads these 16k way to fast to even notice
+		if ( !LoadEncyclopediaItemVisibility( hFile ) )
+		{
+			DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("LoadEncyclopediaItemVisibility failed") );
+			FileClose( hFile );
+			return (FALSE);
+		}
+	#ifdef JA2BETAVERSION
+		LoadGameFilePosition( FileGetPos( hFile), "Encyclopedia item visibility" );
+	#endif
+	}
+	else
+		EncyclopediaInitItemsVisibility();
 	//
 	//Close the saved game file
 	//
@@ -413,6 +413,7 @@ BOOLEAN DeleteVideoObjectFromIndex( UINT32 uiVObject	)
 			if( CountVideoObjectNodes() != guiVObjectSize )
 			{
 				guiVObjectSize = guiVObjectSize;
+				DebugBreakpoint();
 			}
 #endif
 			return TRUE;
@@ -32,6 +32,7 @@
 	#include "wordwrap.h"
 	#include "Soldier macros.h"
 	#include "rt time defines.h"
+	#include "Encyclopedia_new.h" //Moa: item visibility
 #endif

 #include "ShopKeeper Interface.h"
@@ -621,8 +622,13 @@ BOOLEAN RenderItemInPoolSlot( INT32 iCurrentSlot, INT32 iFirstSlotOnPage )
 		//Shade the item, but only if it is an active item!
 		if ( pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object.exists() == true) {
 			DrawHatchOnInventory( guiSAVEBUFFER, sX, sY, MAP_INVEN_SLOT_WIDTH, MAP_INVEN_SLOT_IMAGE_HEIGHT );
+			//Moa: set encyclopedia item visibility (not reachable)
+			EncyclopediaSetItemAsVisible( pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object.usItem, ENC_ITEM_DISCOVERED_NOT_REACHABLE );
 		}
 	}
+	//Moa: set encyclopedia item visibility (reachable)
+	else if ( pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object.exists() == true )
+		EncyclopediaSetItemAsVisible( pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object.usItem, ENC_ITEM_DISCOVERED_NOT_INSPECTABLE );

 	// Flugente: militia equipment
 	if( gGameExternalOptions.fMilitiaUseSectorInventory && ( pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].usFlags & WORLD_ITEM_TABOO_FOR_MILITIA_EQ_ALL ) )
@@ -81,6 +81,7 @@
 	#include "random.h"					// added by Flugente
 	#include "Explosion Control.h"		// added by Flugente
 	#include "Food.h"					// added by Flugente
+	#include "Encyclopedia_new.h"	//Moa: enc. item visibility
 #endif

 #ifdef JA2UB
@@ -3710,7 +3711,8 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE  *pObjec
 		{
 			RestoreExternBackgroundRect( sX, sY, sWidth, sHeight );
 		}
-
+		//Moa: set encyclopedia item visibility
+		EncyclopediaSetItemAsVisible( pItem->uiIndex, ENC_ITEM_DISCOVERED );
 	}

 	SetFont( ITEM_FONT );
@@ -53,6 +53,7 @@
 	#include "PATHAI.h"
 	#include "Points.h"
 	#include "InterfaceItemImages.h"
+	#include "Encyclopedia_new.h"
 #endif

 #ifdef JA2UB
@@ -2839,6 +2840,9 @@ UINT32 DisplayInvSlot( UINT16 ubSlotNum, UINT16 usItemIndex, UINT16 usPosX, UINT
 	//blt the item
 	BltVideoObjectOutlineFromIndex( FRAME_BUFFER, GetInterfaceGraphicForItem( pItem ), g_bUsePngItemImages ? 0 : pItem->ubGraphicNum, sCenX, sCenY, Get16BPPColor( FROMRGB( 255, 255, 255 ) ), fHighlighted );

+	//Moa: encyclopedia item visibility
+	EncyclopediaSetItemAsVisible( usItemIndex, ENC_ITEM_DISCOVERED_INSPECTABLE );
+
 	//Display the status of the item
 	DrawItemUIBarEx( pItemObject, 0, (INT16)(usPosX+2), (INT16)(usPosY+2+20), 2, 20, 	Get16BPPColor( FROMRGB( 140, 136, 119 ) ), Get16BPPColor( FROMRGB( 140, 136, 119 ) ), TRUE, guiRENDERBUFFER );//guiSAVEBUFFER

@@ -25,6 +25,7 @@
 #include "SkillCheck.h"
 #include "soldier profile type.h"
 #include "Soldier macros.h"
+#include "Encyclopedia_new.h"	///< Encyclopedia item visibility
 #endif

 //forward declarations of common classes to eliminate includes
@@ -230,7 +231,11 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 				swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_ENERGY], pStrInfo, pSoldier->bBreath );
 			if ( gGameExternalOptions.fEnableSoldierTooltipMorale )
 				swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_MORALE], pStrInfo, pSoldier->aiData.bMorale );
-						
+			//Moa: show shock and suppression values in debug tooltip
+			if ( gGameExternalOptions.fEnableSoldierTooltipShock )
+				swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_SHOCK], pStrInfo, pSoldier->aiData.bShock );
+			if ( gGameExternalOptions.fEnableSoldierTooltipSuppressionPoints )
+				swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_SUPPRESION], pStrInfo, pSoldier->ubSuppressionPoints );
 			//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 			// Added by SANDRO - show enemy skills
 			if ( gGameExternalOptions.fEnableSoldierTooltipTraits )
@@ -282,11 +287,26 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 		if ( ubTooltipDetailLevel >= DL_Full )
 		{
 			if ( gGameExternalOptions.fEnableSoldierTooltipHelmet )
+			{
 				swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_HELMET], pStrInfo, pSoldier->inv[HELMETPOS].usItem ? ItemNames[ pSoldier->inv[HELMETPOS].usItem ] : gzTooltipStrings[STR_TT_NO_HELMET] );
+				//Moa: encyclopedia item visibility
+				if ( pSoldier->inv[HELMETPOS].usItem )
+					EncyclopediaSetItemAsVisible( pSoldier->inv[HELMETPOS].usItem, ENC_ITEM_DISCOVERED_NOT_REACHABLE );
+			}
 			if ( gGameExternalOptions.fEnableSoldierTooltipVest )
+			{
 				swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_VEST], pStrInfo, pSoldier->inv[VESTPOS].usItem ? ItemNames[ pSoldier->inv[VESTPOS].usItem ] : gzTooltipStrings[STR_TT_NO_VEST] );
+				//Moa: encyclopedia item visibility
+				if ( pSoldier->inv[VESTPOS].usItem )
+					EncyclopediaSetItemAsVisible( pSoldier->inv[VESTPOS].usItem, ENC_ITEM_DISCOVERED_NOT_REACHABLE );
+			}
 			if ( gGameExternalOptions.fEnableSoldierTooltipLeggings )
+			{
 				swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_LEGGINGS], pStrInfo, pSoldier->inv[LEGPOS].usItem ? ItemNames[ pSoldier->inv[LEGPOS].usItem ] : gzTooltipStrings[STR_TT_NO_LEGGING] );
+				//Moa: encyclopedia item visibility
+				if ( pSoldier->inv[LEGPOS].usItem )
+					EncyclopediaSetItemAsVisible( pSoldier->inv[LEGPOS].usItem, ENC_ITEM_DISCOVERED_NOT_REACHABLE );
+			}
 		}
 		else
 		{
@@ -338,6 +358,9 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 				{
 					swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_NVG], pStrInfo,
 						iNVG ? ItemNames[ pSoldier->inv[ iNVG ].usItem ] : gzTooltipStrings[STR_TT_NO_NVG] );
+					//Moa: encyclopedia item visibility
+					if ( iNVG )
+						EncyclopediaSetItemAsVisible( pSoldier->inv[ iNVG ].usItem, ENC_ITEM_DISCOVERED_NOT_REACHABLE );
 				}
 				else
 				{
@@ -350,9 +373,19 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 		else // gGameExternalOptions.ubSoldierTooltipDetailLevel == DL_Debug
 		{
 			if ( gGameExternalOptions.fEnableSoldierTooltipHeadItem1 )
+			{
 				swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_HEAD_POS_1], pStrInfo, ItemNames[ pSoldier->inv[HEAD1POS].usItem ] );
+				//Moa: encyclopedia item visibility
+				if ( pSoldier->inv[HEAD1POS].usItem )
+					EncyclopediaSetItemAsVisible( pSoldier->inv[ HEAD1POS ].usItem, ENC_ITEM_DISCOVERED_NOT_REACHABLE );
+			}
 			if ( gGameExternalOptions.fEnableSoldierTooltipHeadItem2 )
+			{
 				swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_HEAD_POS_2], pStrInfo, ItemNames[ pSoldier->inv[HEAD2POS].usItem ] );
+				//Moa: encyclopedia item visibility
+				if ( pSoldier->inv[HEAD2POS].usItem )
+					EncyclopediaSetItemAsVisible( pSoldier->inv[ HEAD2POS ].usItem, ENC_ITEM_DISCOVERED_NOT_REACHABLE );
+			}
 		}
 		// head slots info code block end

@@ -474,6 +507,9 @@ void DisplayWeaponInfo( SOLDIERTYPE* pSoldier, CHAR16* pStrInfo, UINT8 ubSlot, U
 		// display exact weapon model
 		swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_WEAPON], pStrInfo,
 			WeaponInHand( pSoldier ) ? ItemNames[ pSoldier->inv[ubSlot].usItem ] : gzTooltipStrings[STR_TT_NO_WEAPON] );
+		//Moa: encyclopedia item visibility
+		if ( pSoldier->inv[ubSlot].usItem )
+			EncyclopediaSetItemAsVisible( pSoldier->inv[ ubSlot ].usItem, ENC_ITEM_DISCOVERED_NOT_REACHABLE );
 	}
 	else
 	{
@@ -193,11 +193,14 @@ typedef PARSE_STAGE;
 #define EMAILOTHER								"Email\\EmailOther.xml"
 #define EMAILINSURANCE 							"Email\\EmailInsurance.xml"

-#define ENCYCLOPEDIALOCATIONFILENAME			"Encyclopedia\\EncyclopediaLocations.xml"
-#define ENCYCLOPEDIAPROFILEFILENAME				"Encyclopedia\\EncyclopediaProfiles.xml"
-#define ENCYCLOPEDIAINVENTORYFILENAME			"Encyclopedia\\EncyclopediaInventory.xml"
-#define ENCYCLOPEDIAOTHERFILENAME				"Encyclopedia\\EncyclopediaOthers.xml"
-#define ENCYCLOPEDIAQUESTSFILENAME				"Encyclopedia\\EncyclopediaQuests.xml"
+// WANNE: Old encyclopedia. Not used anymore ..
+#ifdef ENABLE_ENCYCLOPEDIA
+	#define ENCYCLOPEDIALOCATIONFILENAME			"Encyclopedia\\EncyclopediaLocations.xml"
+	#define ENCYCLOPEDIAPROFILEFILENAME				"Encyclopedia\\EncyclopediaProfiles.xml"
+	#define ENCYCLOPEDIAINVENTORYFILENAME			"Encyclopedia\\EncyclopediaInventory.xml"
+	#define ENCYCLOPEDIAOTHERFILENAME				"Encyclopedia\\EncyclopediaOthers.xml"
+	#define ENCYCLOPEDIAQUESTSFILENAME				"Encyclopedia\\EncyclopediaQuests.xml"
+#endif

 #define BRIEFINGROOMFILENAME					"BriefingRoom\\BriefingRoom.xml"

@@ -55,6 +55,14 @@ extern STR16	pSectorPageText[];
 extern STR16	pEncyclopediaHelpText[];
 extern STR16	pEncyclopediaTypeText[];
 extern STR16	pEncyclopediaSkrotyText[];
+extern STR16	pEncyclopediaFilterLocationText[];
+extern STR16	pEncyclopediaSubFilterLocationText[];
+extern STR16	pEncyclopediaFilterCharText[];
+extern STR16	pEncyclopediaSubFilterCharText[];
+extern STR16	pEncyclopediaFilterItemText[];
+extern STR16	pEncyclopediaSubFilterItemText[];
+extern STR16	pEncyclopediaFilterQuestText[];
+extern STR16	pEncyclopediaSubFilterQuestText[];
 extern STR16	pEncyclopediaShortCharacterText[];
 extern STR16	pEncyclopediaHelpCharacterText[];
 extern STR16	pEncyclopediaShortInventoryText[];
@@ -565,6 +573,8 @@ enum
 	STR_TT_CAT_CURRENT_HEALTH,
 	STR_TT_CAT_CURRENT_ENERGY,
 	STR_TT_CAT_CURRENT_MORALE,
+	STR_TT_CAT_SHOCK,		///< Moa: shows current shock value. Only for debug tooltip.
+	STR_TT_CAT_SUPPRESION,	///< Moa: shows current supression value. Only for debug tooltip.
 	STR_TT_CAT_HELMET,
 	STR_TT_CAT_VEST,
 	STR_TT_CAT_LEGGINGS,
@@ -248,6 +248,182 @@ STR16	pEncyclopediaSkrotyText[] =
 	L"监狱", //L"Prison",
 	L"机场", //L"Air.",
 };
+//TODO:Translate
+STR16	pEncyclopediaFilterLocationText[] =
+{//major location filter button text max 7 chars
+//..L"------v"
+	L"全部",//All
+	L"城市",//City
+	L"SAM",//SAM
+	L"矿场",//Mine
+	L"机场",//Airport
+	L"Wilder.",
+	L"Underg.",
+	L"Facil.",
+	L"其他",//Other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"显示全部",//Show all
+	L"显示城市",//Show Cities
+	L"显示SAM",//Show SAM
+	L"显示矿场",//Show mines
+	L"显示机场",//Show airports
+	L"Show sectors in wilderness",
+	L"Show underground sectors",
+	L"Show sectors with facilities\n[|L|B]toggle filter\n[|R|B]reset filter",
+	L"Show Other sectors",
+};
+
+STR16 pEncyclopediaSubFilterLocationText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+	L"",//reserved. Insert new city filters above!
+	L"",//reserved. Insert new SAM filters above!
+	L"",//reserved. Insert new mine filters above!
+	L"",//reserved. Insert new airport filters above!
+	L"",//reserved. Insert new wilderness filters above!
+	L"",//reserved. Insert new underground sector filters above!
+	L"",//reserved. facility filter texts are dynamicly loaded, leave this marker empty!
+	L"",//reserved. Insert new other filters above!
+};
+//TODO:Translate
+STR16	pEncyclopediaFilterCharText[] =
+{//major char filter button text
+//..L"------v"
+	L"全部",//All
+	L"A.I.M.",
+	L"MERC",
+	L"RPC",
+	L"NPC",
+	L"IMP",
+	L"Other",//add new filter buttons before other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"显示全部",//Show all
+	L"Show A.I.M. members",
+	L"Show M.E.R.C staff",
+	L"Show Rebels",
+	L"Show Non-hirable Characters",
+	L"Show Player created Characters",
+	L"Show Other\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+
+STR16	pEncyclopediaSubFilterCharText[] =
+{//item subfilter button text
+//..L"------v"
+	L"",//reserved. Insert new AIM filters above!
+	L"",//reserved. Insert new MERC filters above!
+	L"",//reserved. Insert new RPC filters above!
+	L"",//reserved. Insert new NPC filters above!
+	L"",//reserved. Insert new IMP filters above!
+//Other-----v"
+	L"Vehic.",//TODO:Translate vehicles
+	L"EPC",//TODO:Translate electronic chars
+	L"",//reserved. Insert new Other filters above!
+};
+//TODO:Translate
+STR16	pEncyclopediaFilterItemText[] = 
+{//major item filter button text max 7 chars
+//..L"------v"
+	L"全部",//All
+	L"Gun",
+	L"Ammo",
+	L"Armor",
+	L"LBE",
+	L"Attach.",
+	L"Misc",//add new filter buttons before misc
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"显示全部",//Show all
+	L"Show Guns\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Amunition\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Armor Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show LBE Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Attachments\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Misc Items\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO:Translate
+STR16 pEncyclopediaSubFilterItemText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+//Guns......v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new gun filters above!
+//Amunition.v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new ammo filters above!
+//Armor.....v"
+	L"Helmet",
+	L"Vest",
+	L"Pant",
+	L"Plate",
+	L"",//reserved. insert new armor filters above!
+//LBE.......v"
+	L"Tight",
+	L"Vest",
+	L"Combat",
+	L"Backp.",
+	L"Pocket",
+	L"Other",
+	L"",//reserved. insert new LBE filters above!
+//Attachments"
+	L"Optic",
+	L"Side",
+	L"Muzzle",
+	L"Extern.",
+	L"Intern.",
+	L"Other",
+	L"",//reserved. insert new attachment filters above!
+//Misc......v"
+	L"Blade",
+	L"T.Knife",
+	L"Punch",
+	L"Grenade",
+	L"Bomb",
+	L"Medikit",
+	L"Kit",
+	L"Face",
+	L"Other",
+	L"",//reserved. insert new misc filters above!
+//add filters for a new button here
+};
+//TODO:Translate
+STR16 pEncyclopediaFilterQuestText[] =
+{//major quest filter button text max 7 chars
+//..L"------v"
+	L"全部",//All
+	L"Active",
+	L"Compl.",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"显示全部",//Show all
+	L"Show Active Quests",
+	L"Show Completed Quests",
+};
+
+STR16 pEncyclopediaSubFilterQuestText[] =
+{//Quest subfilter button text max 7 chars, not used, but needed if any subfilters are added
+//..L"------v"
+	L"",//reserved. insert new active quest subfilters above!
+	L"",//reserved. insert new completed quest subfilters above!
+};
+

 STR16	pEncyclopediaShortInventoryText[] = 
 {
@@ -6170,8 +6346,10 @@ STR16 gzTooltipStrings[] =
 	L"%s|属|性: %d\n",
 	L"%s|当|前 |A|Ps: %d\n",
 	L"%s|当|前 |生|命: %d\n",
-	L"%s|当|前|精|力: %d\n",	// TODO.Translate
+	L"%s|当|前|精|力: %d\n",	
 	L"%s|当|前|士|气: %d\n",
+	L"%s|Current |S|hock: %d\n",//TODO.Translate
+	L"%s|Current |S|uppression Points: %d\n",//TODO.Translate
 	// Full info
 	L"%s|头|盔: %s\n",
 	L"%s|防|弹|衣: %s\n",
@@ -250,6 +250,182 @@ STR16	pEncyclopediaSkrotyText[] =
 	L"Air.",
 };

+//TODO.Translate
+STR16	pEncyclopediaFilterLocationText[] =
+{//major location filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"City",
+	L"SAM",
+	L"Mine",
+	L"Airport",
+	L"Wilder.",
+	L"Underg.",
+	L"Facil.",
+	L"Other",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//facility index + 1
+	L"Show Cities",
+	L"Show SAM sites",
+	L"Show mines",
+	L"Show airports",
+	L"Show sectors in wilderness",
+	L"Show underground sectors",
+	L"Show sectors with facilities\n[|L|B]toggle filter\n[|R|B]reset filter",
+	L"Show Other sectors",
+};
+
+STR16 pEncyclopediaSubFilterLocationText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+	L"",//reserved. Insert new city filters above!
+	L"",//reserved. Insert new SAM filters above!
+	L"",//reserved. Insert new mine filters above!
+	L"",//reserved. Insert new airport filters above!
+	L"",//reserved. Insert new wilderness filters above!
+	L"",//reserved. Insert new underground sector filters above!
+	L"",//reserved. facility filter texts are dynamicly loaded, leave this marker empty!
+	L"",//reserved. Insert new other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterCharText[] =
+{//major char filter button text
+//..L"------v"
+	L"All",//0
+	L"A.I.M.",
+	L"MERC",
+	L"RPC",
+	L"NPC",
+	L"IMP",
+	L"Other",//add new filter buttons before other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//Other index + 1
+	L"Show A.I.M. members",
+	L"Show M.E.R.C staff",
+	L"Show Rebels",
+	L"Show Non-hirable Characters",
+	L"Show Player created Characters",
+	L"Show Other\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16	pEncyclopediaSubFilterCharText[] =
+{//item subfilter button text
+//..L"------v"
+	L"",//reserved. Insert new AIM filters above!
+	L"",//reserved. Insert new MERC filters above!
+	L"",//reserved. Insert new RPC filters above!
+	L"",//reserved. Insert new NPC filters above!
+	L"",//reserved. Insert new IMP filters above!
+//Other-----v"
+	L"Vehic.",
+	L"EPC",
+	L"",//reserved. Insert new Other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterItemText[] = 
+{//major item filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"Gun",
+	L"Ammo",
+	L"Armor",
+	L"LBE",
+	L"Attach.",
+	L"Misc",//add new filter buttons before misc
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Guns\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Amunition\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Armor Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show LBE Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Attachments\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Misc Items\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16 pEncyclopediaSubFilterItemText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+//Guns......v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new gun filters above!
+//Amunition.v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new ammo filters above!
+//Armor.....v"
+	L"Helmet",
+	L"Vest",
+	L"Pant",
+	L"Plate",
+	L"",//reserved. insert new armor filters above!
+//LBE.......v"
+	L"Tight",
+	L"Vest",
+	L"Combat",
+	L"Backp.",
+	L"Pocket",
+	L"Other",
+	L"",//reserved. insert new LBE filters above!
+//Attachments"
+	L"Optic",
+	L"Side",
+	L"Muzzle",
+	L"Extern.",
+	L"Intern.",
+	L"Other",
+	L"",//reserved. insert new attachment filters above!
+//Misc......v"
+	L"Blade",
+	L"T.Knife",
+	L"Punch",
+	L"Grenade",
+	L"Bomb",
+	L"Medikit",
+	L"Kit",
+	L"Face",
+	L"Other",
+	L"",//reserved. insert new misc filters above!
+//add filters for a new button here
+};
+//TODO.Translate
+STR16 pEncyclopediaFilterQuestText[] =
+{//major quest filter button text max 7 chars
+//..L"------v"
+	L"All",
+	L"Active",
+	L"Compl.",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Active Quests",
+	L"Show Completed Quests",
+};
+
+STR16 pEncyclopediaSubFilterQuestText[] =
+{//Quest subfilter button text max 7 chars, not used, but needed if any subfilters are added
+//..L"------v"
+	L"",//reserved. insert new active quest subfilters above!
+	L"",//reserved. insert new completed quest subfilters above!
+};
+
 STR16	pEncyclopediaShortInventoryText[] = 
 {
 	L"All", //0
@@ -6178,6 +6354,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Current |Health: %d\n",
 	L"%s|Current |Breath: %d\n",	// TODO.Translate
 	L"%s|Current |Morale: %d\n",
+	L"%s|Current |S|hock: %d\n",//TODO.Translate
+	L"%s|Current |S|uppression Points: %d\n",//TODO.Translate
 	// Full info
 	L"%s|Helmet: %s\n",
 	L"%s|Vest: %s\n",
@@ -249,6 +249,182 @@ STR16	pEncyclopediaSkrotyText[] =
 	L"Air.",
 };

+STR16	pEncyclopediaFilterLocationText[] =
+{//major location filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"City",
+	L"SAM",
+	L"Mine",
+	L"Airport",
+	L"Wilder.",
+	L"Underg.",
+	L"Facil.",
+	L"Other",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//facility index + 1
+	L"Show Cities",
+	L"Show SAM sites",
+	L"Show mines",
+	L"Show airports",
+	L"Show sectors in wilderness",
+	L"Show underground sectors",
+	L"Show sectors with facilities\n[|L|B]toggle filter\n[|R|B]reset filter",
+	L"Show Other sectors",
+};
+
+STR16 pEncyclopediaSubFilterLocationText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+	L"",//reserved. Insert new city filters above!
+	L"",//reserved. Insert new SAM filters above!
+	L"",//reserved. Insert new mine filters above!
+	L"",//reserved. Insert new airport filters above!
+	L"",//reserved. Insert new wilderness filters above!
+	L"",//reserved. Insert new underground sector filters above!
+	L"",//reserved. facility filter texts are dynamicly loaded, leave this marker empty!
+	L"",//reserved. Insert new other filters above!
+};
+
+STR16	pEncyclopediaFilterCharText[] =
+{//major char filter button text
+//..L"------v"
+	L"All",//0
+	L"A.I.M.",
+	L"MERC",
+	L"RPC",
+	L"NPC",
+	L"IMP",
+	L"Other",//add new filter buttons before other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//Other index + 1
+	L"Show A.I.M. members",
+	L"Show M.E.R.C staff",
+	L"Show Rebels",
+	L"Show Non-hirable Characters",
+	L"Show Player created Characters",
+	L"Show Other\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+
+STR16	pEncyclopediaSubFilterCharText[] =
+{//item subfilter button text
+//..L"------v"
+	L"",//reserved. Insert new AIM filters above!
+	L"",//reserved. Insert new MERC filters above!
+	L"",//reserved. Insert new RPC filters above!
+	L"",//reserved. Insert new NPC filters above!
+	L"",//reserved. Insert new IMP filters above!
+//Other-----v"
+	L"Vehic.",
+	L"EPC",
+	L"",//reserved. Insert new Other filters above!
+};
+
+STR16	pEncyclopediaFilterItemText[] = 
+{//major item filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"Gun",
+	L"Ammo",
+	L"Armor",
+	L"LBE",
+	L"Attach.",
+	L"Misc",//add new filter buttons before misc
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Guns\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Amunition\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Armor Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show LBE Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Attachments\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Misc Items\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+
+STR16 pEncyclopediaSubFilterItemText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+//Guns......v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new gun filters above!
+//Amunition.v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new ammo filters above!
+//Armor.....v"
+	L"Helmet",
+	L"Vest",
+	L"Pant",
+	L"Plate",
+	L"",//reserved. insert new armor filters above!
+//LBE.......v"
+	L"Tight",
+	L"Vest",
+	L"Combat",
+	L"Backp.",
+	L"Pocket",
+	L"Other",
+	L"",//reserved. insert new LBE filters above!
+//Attachments"
+	L"Optic",
+	L"Side",
+	L"Muzzle",
+	L"Extern.",
+	L"Intern.",
+	L"Other",
+	L"",//reserved. insert new attachment filters above!
+//Misc......v"
+	L"Blade",
+	L"T.Knife",
+	L"Punch",
+	L"Grenade",
+	L"Bomb",
+	L"Medikit",
+	L"Kit",
+	L"Face",
+	L"Other",
+	L"",//reserved. insert new misc filters above!
+//add filters for a new button here
+};
+
+STR16 pEncyclopediaFilterQuestText[] =
+{//major quest filter button text max 7 chars
+//..L"------v"
+	L"All",
+	L"Active",
+	L"Compl.",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Active Quests",
+	L"Show Completed Quests",
+};
+
+STR16 pEncyclopediaSubFilterQuestText[] =
+{//Quest subfilter button text max 7 chars, not used, but needed if any subfilters are added
+//..L"------v"
+	L"",//reserved. insert new active quest subfilters above!
+	L"",//reserved. insert new completed quest subfilters above!
+};
+
+
 STR16	pEncyclopediaShortInventoryText[] = 
 {
 	L"All", //0
@@ -6172,6 +6348,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Current |Health: %d\n",
 	L"%s|Current |Breath: %d\n",
 	L"%s|Current |Morale: %d\n",
+	L"%s|Current |S|hock: %d\n",
+	L"%s|Current |S|uppression Points: %d\n",
 	// Full info
 	L"%s|Helmet: %s\n",
 	L"%s|Vest: %s\n",
@@ -254,6 +254,182 @@ STR16	pEncyclopediaSkrotyText[] =
 	L"Aéro.",
 };

+//TODO.Translate
+STR16	pEncyclopediaFilterLocationText[] =
+{//major location filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"City",
+	L"SAM",
+	L"Mine",
+	L"Airport",
+	L"Wilder.",
+	L"Underg.",
+	L"Facil.",
+	L"Other",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//facility index + 1
+	L"Show Cities",
+	L"Show SAM sites",
+	L"Show mines",
+	L"Show airports",
+	L"Show sectors in wilderness",
+	L"Show underground sectors",
+	L"Show sectors with facilities\n[|L|B]toggle filter\n[|R|B]reset filter",
+	L"Show Other sectors",
+};
+
+STR16 pEncyclopediaSubFilterLocationText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+	L"",//reserved. Insert new city filters above!
+	L"",//reserved. Insert new SAM filters above!
+	L"",//reserved. Insert new mine filters above!
+	L"",//reserved. Insert new airport filters above!
+	L"",//reserved. Insert new wilderness filters above!
+	L"",//reserved. Insert new underground sector filters above!
+	L"",//reserved. facility filter texts are dynamicly loaded, leave this marker empty!
+	L"",//reserved. Insert new other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterCharText[] =
+{//major char filter button text
+//..L"------v"
+	L"All",//0
+	L"A.I.M.",
+	L"MERC",
+	L"RPC",
+	L"NPC",
+	L"IMP",
+	L"Other",//add new filter buttons before other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//Other index + 1
+	L"Show A.I.M. members",
+	L"Show M.E.R.C staff",
+	L"Show Rebels",
+	L"Show Non-hirable Characters",
+	L"Show Player created Characters",
+	L"Show Other\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16	pEncyclopediaSubFilterCharText[] =
+{//item subfilter button text
+//..L"------v"
+	L"",//reserved. Insert new AIM filters above!
+	L"",//reserved. Insert new MERC filters above!
+	L"",//reserved. Insert new RPC filters above!
+	L"",//reserved. Insert new NPC filters above!
+	L"",//reserved. Insert new IMP filters above!
+//Other-----v"
+	L"Vehic.",
+	L"EPC",
+	L"",//reserved. Insert new Other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterItemText[] = 
+{//major item filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"Gun",
+	L"Ammo",
+	L"Armor",
+	L"LBE",
+	L"Attach.",
+	L"Misc",//add new filter buttons before misc
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Guns\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Amunition\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Armor Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show LBE Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Attachments\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Misc Items\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16 pEncyclopediaSubFilterItemText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+//Guns......v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new gun filters above!
+//Amunition.v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new ammo filters above!
+//Armor.....v"
+	L"Helmet",
+	L"Vest",
+	L"Pant",
+	L"Plate",
+	L"",//reserved. insert new armor filters above!
+//LBE.......v"
+	L"Tight",
+	L"Vest",
+	L"Combat",
+	L"Backp.",
+	L"Pocket",
+	L"Other",
+	L"",//reserved. insert new LBE filters above!
+//Attachments"
+	L"Optic",
+	L"Side",
+	L"Muzzle",
+	L"Extern.",
+	L"Intern.",
+	L"Other",
+	L"",//reserved. insert new attachment filters above!
+//Misc......v"
+	L"Blade",
+	L"T.Knife",
+	L"Punch",
+	L"Grenade",
+	L"Bomb",
+	L"Medikit",
+	L"Kit",
+	L"Face",
+	L"Other",
+	L"",//reserved. insert new misc filters above!
+//add filters for a new button here
+};
+//TODO.Translate
+STR16 pEncyclopediaFilterQuestText[] =
+{//major quest filter button text max 7 chars
+//..L"------v"
+	L"All",
+	L"Active",
+	L"Compl.",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Active Quests",
+	L"Show Completed Quests",
+};
+
+STR16 pEncyclopediaSubFilterQuestText[] =
+{//Quest subfilter button text max 7 chars, not used, but needed if any subfilters are added
+//..L"------v"
+	L"",//reserved. insert new active quest subfilters above!
+	L"",//reserved. insert new completed quest subfilters above!
+};
+
 STR16	pEncyclopediaShortInventoryText[] = 
 {
 	L"Tout", //0
@@ -6173,6 +6349,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Santé |Actuel : %d\n",
 	L"%s|Current |Breath: %d\n",	// TODO.Translate
 	L"%s|Current |Morale: %d\n",
+	L"%s|Current |S|hock: %d\n",//TODO.Translate
+	L"%s|Current |S|uppression Points: %d\n",//TODO.Translate
 	// Full info
 	L"%s|Casque : %s\n",
 	L"%s|Veste : %s\n",
@@ -273,6 +273,181 @@ STR16	pEncyclopediaSkrotyText[] =
 	L"Flugh.",
 };

+STR16	pEncyclopediaFilterLocationText[] =
+{//major location filter button text max 7 chars
+//..L"------v"
+	L"Alle",//0
+	L"Stadt",
+	L"SAM",
+	L"Mine",
+	L"Flugh.",
+	L"Wildn.",
+	L"Unterg.",
+	L"Gebäude",
+	L"andere",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Zeige Alle",//facility index + 1
+	L"Zeige Stadtsektoren",
+	L"Zeige SAM's ",
+	L"Zeige Mine",
+	L"Zeige Flughäfen",
+	L"Zeige Sektoren in der Wildniss",
+	L"Zeige Untergrund",
+	L"Zeige wichtige Gebäude\n[|L|MT] ändere Filter\n[|R|MT] F. zurücksetzen",
+	L"Zeige andere Sektoren",
+};
+
+STR16 pEncyclopediaSubFilterLocationText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+	L"",//reserved. Insert new city filters above!
+	L"",//reserved. Insert new SAM filters above!
+	L"",//reserved. Insert new mine filters above!
+	L"",//reserved. Insert new airport filters above!
+	L"",//reserved. Insert new wilderness filters above!
+	L"",//reserved. Insert new underground sector filters above!
+	L"",//reserved. facility filter texts are dynamicly loaded, leave this marker empty!
+	L"",//reserved. Insert new other filters above!
+};
+
+STR16	pEncyclopediaFilterCharText[] =
+{//major char filter button text
+//..L"------v"
+	L"Alle",//0
+	L"A.I.M.",
+	L"MERC",
+	L"RPC",
+	L"NPC",
+	L"IMP",
+	L"Andere",//add new filter buttons before other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Zeige Alle",//Other index + 1
+	L"Zeige A.I.M. Mitarbeiter",
+	L"Zeige M.E.R.C Mitarbeiter",
+	L"Zeige Rebellen",
+	L"Zeige Nichtspieler Charaktere",
+	L"Zeige Spieler Charaktere",
+	L"Zeige Andere\n[|L|MT] ändere Filter\n[|R|MT] F. zurücksetzen",
+};
+
+STR16	pEncyclopediaSubFilterCharText[] =
+{//item subfilter button text
+//..L"------v"
+	L"",//reserved. Insert new AIM filters above!
+	L"",//reserved. Insert new MERC filters above!
+	L"",//reserved. Insert new RPC filters above!
+	L"",//reserved. Insert new NPC filters above!
+	L"",//reserved. Insert new IMP filters above!
+//Other-----v"
+	L"Fahrz.",
+	L"EPC",
+	L"",//reserved. Insert new Other filters above!
+};
+
+STR16	pEncyclopediaFilterItemText[] = 
+{//major item filter button text max 7 chars
+//..L"------v"
+	L"Alle",//0
+	L"Hand.W.",
+	L"Muni.",
+	L"Rüstung",
+	L"LBE",
+	L"Zubeh.",
+	L"Versch.",//add new filter buttons before misc
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Zeige Alle",//misc index + 1
+	L"Zeige Handfeuer Waffen\n[|L|MT] ändere Filter\n[|R|MT] F. zurücksetzen",
+	L"Zeige Munition\n[|L|MT] ändere Filter\n[|R|MT] Filter zurücksetzen",
+	L"Zeige Rüstung\n[|L|MT] ändere Filter\n[|R|MT] Filter zurücksetzen",
+	L"Zeige LBE-Gepäck\n[|L|MT] ändere Filter\n[|R|MT] Filter zurücksetzen",
+	L"Zeige Zubehör\n[|L|MT] ändere Filter\n[|R|MT] Filter zurücksetzen",
+	L"Zeige Verschiedenes\n[|L|MT] ändere Filter\n[|R|MT] F. zurücksetzen",
+};
+
+STR16 pEncyclopediaSubFilterItemText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+//Guns......v"
+	L"Pistole",
+	L"M.Pist.",
+	L"lei. MG",
+	L"Gewehr",
+	L"Scharfs",
+	L"Sturm G",
+	L"MG",
+	L"Schrot.",
+	L"Schwere",
+	L"",//reserved. insert new gun filters above!
+//Amunition.v"
+	L"Pistole",
+	L"M.Pist.",
+	L"lei. MG",
+	L"Gewehr",
+	L"Scharfs",
+	L"Sturm G",
+	L"MG",
+	L"Schrot.",
+	L"Schwere",
+	L"",//reserved. insert new ammo filters above!
+//Armor.....v"
+	L"Helm",
+	L"Weste",
+	L"Hose",
+	L"Platte",
+	L"",//reserved. insert new armor filters above!
+//LBE.......v"
+	L"Gürtel",
+	L"Weste",
+	L"Kampfg.",
+	L"Marsch.",
+	L"Tasche",
+	L"Andere",
+	L"",//reserved. insert new LBE filters above!
+//Attachments"
+	L"Optik",
+	L"Seite",
+	L"Lauf",
+	L"Extern",
+	L"Intern",
+	L"Andere",
+	L"",//reserved. insert new attachment filters above!
+//Misc......v"
+	L"Messer",
+	L"Wurf M.",
+	L"Schlag",
+	L"Kranate",
+	L"Sprengs",
+	L"Medikit",
+	L"Kit",
+	L"Kopf",
+	L"Andere",
+	L"",//reserved. insert new misc filters above!
+//add filters for a new button here
+};
+
+STR16 pEncyclopediaFilterQuestText[] =
+{//major quest filter button text max 7 chars
+//..L"------v"
+	L"Alle",
+	L"Aktiv",
+	L"Abges.",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Zeige Alle",//misc index + 1
+	L"Zeige Aktive Quests",
+	L"Zeige Abgeschlossene Quests",
+};
+
+STR16 pEncyclopediaSubFilterQuestText[] =
+{//Quest subfilter button text max 7 chars, not used, but needed if any subfilters are added
+//..L"------v"
+	L"",//reserved. insert new active quest subfilters above!
+	L"",//reserved. insert new completed quest subfilters above!
+};
+
 STR16	pEncyclopediaShortInventoryText[] = 
 {
 	L"Alle", //0
@@ -5999,6 +6174,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Aktuelle |Gesundheit: %d\n",
 	L"%s|Aktueller |Atem: %d\n",
 	L"%s|Aktuelle |Moral: %d\n",
+	L"%s|Aktueller |Schock: %d\n",
+	L"%s|Aktuelle |S|perrfeuer P.: %d\n",
 	// Full info
 	L"%s|Helm: %s\n",
 	L"%s|Weste: %s\n",
@@ -248,6 +248,182 @@ STR16	pEncyclopediaSkrotyText[] =
 	L"Air.",
 };

+//TODO.Translate
+STR16	pEncyclopediaFilterLocationText[] =
+{//major location filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"City",
+	L"SAM",
+	L"Mine",
+	L"Airport",
+	L"Wilder.",
+	L"Underg.",
+	L"Facil.",
+	L"Other",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//facility index + 1
+	L"Show Cities",
+	L"Show SAM sites",
+	L"Show mines",
+	L"Show airports",
+	L"Show sectors in wilderness",
+	L"Show underground sectors",
+	L"Show sectors with facilities\n[|L|B]toggle filter\n[|R|B]reset filter",
+	L"Show Other sectors",
+};
+
+STR16 pEncyclopediaSubFilterLocationText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+	L"",//reserved. Insert new city filters above!
+	L"",//reserved. Insert new SAM filters above!
+	L"",//reserved. Insert new mine filters above!
+	L"",//reserved. Insert new airport filters above!
+	L"",//reserved. Insert new wilderness filters above!
+	L"",//reserved. Insert new underground sector filters above!
+	L"",//reserved. facility filter texts are dynamicly loaded, leave this marker empty!
+	L"",//reserved. Insert new other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterCharText[] =
+{//major char filter button text
+//..L"------v"
+	L"All",//0
+	L"A.I.M.",
+	L"MERC",
+	L"RPC",
+	L"NPC",
+	L"IMP",
+	L"Other",//add new filter buttons before other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//Other index + 1
+	L"Show A.I.M. members",
+	L"Show M.E.R.C staff",
+	L"Show Rebels",
+	L"Show Non-hirable Characters",
+	L"Show Player created Characters",
+	L"Show Other\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16	pEncyclopediaSubFilterCharText[] =
+{//item subfilter button text
+//..L"------v"
+	L"",//reserved. Insert new AIM filters above!
+	L"",//reserved. Insert new MERC filters above!
+	L"",//reserved. Insert new RPC filters above!
+	L"",//reserved. Insert new NPC filters above!
+	L"",//reserved. Insert new IMP filters above!
+//Other-----v"
+	L"Vehic.",
+	L"EPC",
+	L"",//reserved. Insert new Other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterItemText[] = 
+{//major item filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"Gun",
+	L"Ammo",
+	L"Armor",
+	L"LBE",
+	L"Attach.",
+	L"Misc",//add new filter buttons before misc
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Guns\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Amunition\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Armor Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show LBE Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Attachments\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Misc Items\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16 pEncyclopediaSubFilterItemText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+//Guns......v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new gun filters above!
+//Amunition.v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new ammo filters above!
+//Armor.....v"
+	L"Helmet",
+	L"Vest",
+	L"Pant",
+	L"Plate",
+	L"",//reserved. insert new armor filters above!
+//LBE.......v"
+	L"Tight",
+	L"Vest",
+	L"Combat",
+	L"Backp.",
+	L"Pocket",
+	L"Other",
+	L"",//reserved. insert new LBE filters above!
+//Attachments"
+	L"Optic",
+	L"Side",
+	L"Muzzle",
+	L"Extern.",
+	L"Intern.",
+	L"Other",
+	L"",//reserved. insert new attachment filters above!
+//Misc......v"
+	L"Blade",
+	L"T.Knife",
+	L"Punch",
+	L"Grenade",
+	L"Bomb",
+	L"Medikit",
+	L"Kit",
+	L"Face",
+	L"Other",
+	L"",//reserved. insert new misc filters above!
+//add filters for a new button here
+};
+//TODO.Translate
+STR16 pEncyclopediaFilterQuestText[] =
+{//major quest filter button text max 7 chars
+//..L"------v"
+	L"All",
+	L"Active",
+	L"Compl.",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Active Quests",
+	L"Show Completed Quests",
+};
+
+STR16 pEncyclopediaSubFilterQuestText[] =
+{//Quest subfilter button text max 7 chars, not used, but needed if any subfilters are added
+//..L"------v"
+	L"",//reserved. insert new active quest subfilters above!
+	L"",//reserved. insert new completed quest subfilters above!
+};
+
 STR16	pEncyclopediaShortInventoryText[] = 
 {
 	L"All", //0
@@ -6164,6 +6340,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Current |Health: %d\n",
 	L"%s|Current |Breath: %d\n",	// TODO.Translate
 	L"%s|Current |Morale: %d\n",
+	L"%s|Current |S|hock: %d\n",//TODO.Translate
+	L"%s|Current |S|uppression Points: %d\n",//TODO.Translate
 	// Full info
 	L"%s|Helmet: %s\n",
 	L"%s|Vest: %s\n",
@@ -250,6 +250,182 @@ STR16	pEncyclopediaSkrotyText[] =
 	L"Por.L.",
 };

+//TODO.Translate
+STR16	pEncyclopediaFilterLocationText[] =
+{//major location filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"City",
+	L"SAM",
+	L"Mine",
+	L"Airport",
+	L"Wilder.",
+	L"Underg.",
+	L"Facil.",
+	L"Other",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//facility index + 1
+	L"Show Cities",
+	L"Show SAM sites",
+	L"Show mines",
+	L"Show airports",
+	L"Show sectors in wilderness",
+	L"Show underground sectors",
+	L"Show sectors with facilities\n[|L|B]toggle filter\n[|R|B]reset filter",
+	L"Show Other sectors",
+};
+
+STR16 pEncyclopediaSubFilterLocationText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+	L"",//reserved. Insert new city filters above!
+	L"",//reserved. Insert new SAM filters above!
+	L"",//reserved. Insert new mine filters above!
+	L"",//reserved. Insert new airport filters above!
+	L"",//reserved. Insert new wilderness filters above!
+	L"",//reserved. Insert new underground sector filters above!
+	L"",//reserved. facility filter texts are dynamicly loaded, leave this marker empty!
+	L"",//reserved. Insert new other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterCharText[] =
+{//major char filter button text
+//..L"------v"
+	L"All",//0
+	L"A.I.M.",
+	L"MERC",
+	L"RPC",
+	L"NPC",
+	L"IMP",
+	L"Other",//add new filter buttons before other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//Other index + 1
+	L"Show A.I.M. members",
+	L"Show M.E.R.C staff",
+	L"Show Rebels",
+	L"Show Non-hirable Characters",
+	L"Show Player created Characters",
+	L"Show Other\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16	pEncyclopediaSubFilterCharText[] =
+{//item subfilter button text
+//..L"------v"
+	L"",//reserved. Insert new AIM filters above!
+	L"",//reserved. Insert new MERC filters above!
+	L"",//reserved. Insert new RPC filters above!
+	L"",//reserved. Insert new NPC filters above!
+	L"",//reserved. Insert new IMP filters above!
+//Other-----v"
+	L"Vehic.",
+	L"EPC",
+	L"",//reserved. Insert new Other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterItemText[] = 
+{//major item filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"Gun",
+	L"Ammo",
+	L"Armor",
+	L"LBE",
+	L"Attach.",
+	L"Misc",//add new filter buttons before misc
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Guns\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Amunition\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Armor Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show LBE Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Attachments\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Misc Items\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16 pEncyclopediaSubFilterItemText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+//Guns......v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new gun filters above!
+//Amunition.v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new ammo filters above!
+//Armor.....v"
+	L"Helmet",
+	L"Vest",
+	L"Pant",
+	L"Plate",
+	L"",//reserved. insert new armor filters above!
+//LBE.......v"
+	L"Tight",
+	L"Vest",
+	L"Combat",
+	L"Backp.",
+	L"Pocket",
+	L"Other",
+	L"",//reserved. insert new LBE filters above!
+//Attachments"
+	L"Optic",
+	L"Side",
+	L"Muzzle",
+	L"Extern.",
+	L"Intern.",
+	L"Other",
+	L"",//reserved. insert new attachment filters above!
+//Misc......v"
+	L"Blade",
+	L"T.Knife",
+	L"Punch",
+	L"Grenade",
+	L"Bomb",
+	L"Medikit",
+	L"Kit",
+	L"Face",
+	L"Other",
+	L"",//reserved. insert new misc filters above!
+//add filters for a new button here
+};
+//TODO.Translate
+STR16 pEncyclopediaFilterQuestText[] =
+{//major quest filter button text max 7 chars
+//..L"------v"
+	L"All",
+	L"Active",
+	L"Compl.",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Active Quests",
+	L"Show Completed Quests",
+};
+
+STR16 pEncyclopediaSubFilterQuestText[] =
+{//Quest subfilter button text max 7 chars, not used, but needed if any subfilters are added
+//..L"------v"
+	L"",//reserved. insert new active quest subfilters above!
+	L"",//reserved. insert new completed quest subfilters above!
+};
+
 STR16	pEncyclopediaShortInventoryText[] = 
 {
 	L"Wszystko", //0
@@ -6184,6 +6360,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Aktualne |Zdrowie: %d\n",
 	L"%s|Current |Breath: %d\n",	// TODO.Translate
 	L"%s|Current |Morale: %d\n",
+	L"%s|Current |S|hock: %d\n",//TODO.Translate
+	L"%s|Current |S|uppression Points: %d\n",//TODO.Translate
 	// Full info
 	L"%s|Hełm: %s\n",
 	L"%s|Kamizelka: %s\n",
@@ -249,6 +249,182 @@ STR16	pEncyclopediaSkrotyText[] =
 	L"Air.",
 };

+//TODO.Translate
+STR16	pEncyclopediaFilterLocationText[] =
+{//major location filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"City",
+	L"SAM",
+	L"Mine",
+	L"Airport",
+	L"Wilder.",
+	L"Underg.",
+	L"Facil.",
+	L"Other",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//facility index + 1
+	L"Show Cities",
+	L"Show SAM sites",
+	L"Show mines",
+	L"Show airports",
+	L"Show sectors in wilderness",
+	L"Show underground sectors",
+	L"Show sectors with facilities\n[|L|B]toggle filter\n[|R|B]reset filter",
+	L"Show Other sectors",
+};
+
+STR16 pEncyclopediaSubFilterLocationText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+	L"",//reserved. Insert new city filters above!
+	L"",//reserved. Insert new SAM filters above!
+	L"",//reserved. Insert new mine filters above!
+	L"",//reserved. Insert new airport filters above!
+	L"",//reserved. Insert new wilderness filters above!
+	L"",//reserved. Insert new underground sector filters above!
+	L"",//reserved. facility filter texts are dynamicly loaded, leave this marker empty!
+	L"",//reserved. Insert new other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterCharText[] =
+{//major char filter button text
+//..L"------v"
+	L"All",//0
+	L"A.I.M.",
+	L"MERC",
+	L"RPC",
+	L"NPC",
+	L"IMP",
+	L"Other",//add new filter buttons before other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//Other index + 1
+	L"Show A.I.M. members",
+	L"Show M.E.R.C staff",
+	L"Show Rebels",
+	L"Show Non-hirable Characters",
+	L"Show Player created Characters",
+	L"Show Other\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16	pEncyclopediaSubFilterCharText[] =
+{//item subfilter button text
+//..L"------v"
+	L"",//reserved. Insert new AIM filters above!
+	L"",//reserved. Insert new MERC filters above!
+	L"",//reserved. Insert new RPC filters above!
+	L"",//reserved. Insert new NPC filters above!
+	L"",//reserved. Insert new IMP filters above!
+//Other-----v"
+	L"Vehic.",
+	L"EPC",
+	L"",//reserved. Insert new Other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterItemText[] = 
+{//major item filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"Gun",
+	L"Ammo",
+	L"Armor",
+	L"LBE",
+	L"Attach.",
+	L"Misc",//add new filter buttons before misc
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Guns\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Amunition\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Armor Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show LBE Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Attachments\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Misc Items\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16 pEncyclopediaSubFilterItemText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+//Guns......v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new gun filters above!
+//Amunition.v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new ammo filters above!
+//Armor.....v"
+	L"Helmet",
+	L"Vest",
+	L"Pant",
+	L"Plate",
+	L"",//reserved. insert new armor filters above!
+//LBE.......v"
+	L"Tight",
+	L"Vest",
+	L"Combat",
+	L"Backp.",
+	L"Pocket",
+	L"Other",
+	L"",//reserved. insert new LBE filters above!
+//Attachments"
+	L"Optic",
+	L"Side",
+	L"Muzzle",
+	L"Extern.",
+	L"Intern.",
+	L"Other",
+	L"",//reserved. insert new attachment filters above!
+//Misc......v"
+	L"Blade",
+	L"T.Knife",
+	L"Punch",
+	L"Grenade",
+	L"Bomb",
+	L"Medikit",
+	L"Kit",
+	L"Face",
+	L"Other",
+	L"",//reserved. insert new misc filters above!
+//add filters for a new button here
+};
+//TODO.Translate
+STR16 pEncyclopediaFilterQuestText[] =
+{//major quest filter button text max 7 chars
+//..L"------v"
+	L"All",
+	L"Active",
+	L"Compl.",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Active Quests",
+	L"Show Completed Quests",
+};
+
+STR16 pEncyclopediaSubFilterQuestText[] =
+{//Quest subfilter button text max 7 chars, not used, but needed if any subfilters are added
+//..L"------v"
+	L"",//reserved. insert new active quest subfilters above!
+	L"",//reserved. insert new completed quest subfilters above!
+};
+
 STR16	pEncyclopediaShortInventoryText[] = 
 {
 	L"All", //0
@@ -6171,6 +6347,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Текущее |Здоровье: %d\n",
 	L"%s|Current |Breath: %d\n",	// TODO.Translate
 	L"%s|Current |Morale: %d\n",
+	L"%s|Current |S|hock: %d\n",//TODO.Translate
+	L"%s|Current |S|uppression Points: %d\n",//TODO.Translate
 	// Full info
 	L"%s|Каска: %s\n",
 	L"%s|Жилет: %s\n",
@@ -248,6 +248,182 @@ STR16	pEncyclopediaSkrotyText[] =
 	L"Air.",
 };

+//TODO.Translate
+STR16	pEncyclopediaFilterLocationText[] =
+{//major location filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"City",
+	L"SAM",
+	L"Mine",
+	L"Airport",
+	L"Wilder.",
+	L"Underg.",
+	L"Facil.",
+	L"Other",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//facility index + 1
+	L"Show Cities",
+	L"Show SAM sites",
+	L"Show mines",
+	L"Show airports",
+	L"Show sectors in wilderness",
+	L"Show underground sectors",
+	L"Show sectors with facilities\n[|L|B]toggle filter\n[|R|B]reset filter",
+	L"Show Other sectors",
+};
+
+STR16 pEncyclopediaSubFilterLocationText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+	L"",//reserved. Insert new city filters above!
+	L"",//reserved. Insert new SAM filters above!
+	L"",//reserved. Insert new mine filters above!
+	L"",//reserved. Insert new airport filters above!
+	L"",//reserved. Insert new wilderness filters above!
+	L"",//reserved. Insert new underground sector filters above!
+	L"",//reserved. facility filter texts are dynamicly loaded, leave this marker empty!
+	L"",//reserved. Insert new other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterCharText[] =
+{//major char filter button text
+//..L"------v"
+	L"All",//0
+	L"A.I.M.",
+	L"MERC",
+	L"RPC",
+	L"NPC",
+	L"IMP",
+	L"Other",//add new filter buttons before other
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//Other index + 1
+	L"Show A.I.M. members",
+	L"Show M.E.R.C staff",
+	L"Show Rebels",
+	L"Show Non-hirable Characters",
+	L"Show Player created Characters",
+	L"Show Other\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16	pEncyclopediaSubFilterCharText[] =
+{//item subfilter button text
+//..L"------v"
+	L"",//reserved. Insert new AIM filters above!
+	L"",//reserved. Insert new MERC filters above!
+	L"",//reserved. Insert new RPC filters above!
+	L"",//reserved. Insert new NPC filters above!
+	L"",//reserved. Insert new IMP filters above!
+//Other-----v"
+	L"Vehic.",
+	L"EPC",
+	L"",//reserved. Insert new Other filters above!
+};
+//TODO.Translate
+STR16	pEncyclopediaFilterItemText[] = 
+{//major item filter button text max 7 chars
+//..L"------v"
+	L"All",//0
+	L"Gun",
+	L"Ammo",
+	L"Armor",
+	L"LBE",
+	L"Attach.",
+	L"Misc",//add new filter buttons before misc
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Guns\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Amunition\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Armor Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show LBE Gear\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Attachments\n[|L|B] toggle filter\n[|R|B] reset filter",
+	L"Show Misc Items\n[|L|B] toggle filter\n[|R|B] reset filter",
+};
+//TODO.Translate
+STR16 pEncyclopediaSubFilterItemText[] =
+{//item subfilter button text max 7 chars
+//..L"------v"
+//Guns......v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new gun filters above!
+//Amunition.v"
+	L"Pistol",
+	L"M.Pist.",
+	L"SMG",
+	L"Rifle",
+	L"SN Rif.",
+	L"AS Rif.",
+	L"MG",
+	L"Shotgun",
+	L"H.Weap.",
+	L"",//reserved. insert new ammo filters above!
+//Armor.....v"
+	L"Helmet",
+	L"Vest",
+	L"Pant",
+	L"Plate",
+	L"",//reserved. insert new armor filters above!
+//LBE.......v"
+	L"Tight",
+	L"Vest",
+	L"Combat",
+	L"Backp.",
+	L"Pocket",
+	L"Other",
+	L"",//reserved. insert new LBE filters above!
+//Attachments"
+	L"Optic",
+	L"Side",
+	L"Muzzle",
+	L"Extern.",
+	L"Intern.",
+	L"Other",
+	L"",//reserved. insert new attachment filters above!
+//Misc......v"
+	L"Blade",
+	L"T.Knife",
+	L"Punch",
+	L"Grenade",
+	L"Bomb",
+	L"Medikit",
+	L"Kit",
+	L"Face",
+	L"Other",
+	L"",//reserved. insert new misc filters above!
+//add filters for a new button here
+};
+//TODO.Translate
+STR16 pEncyclopediaFilterQuestText[] =
+{//major quest filter button text max 7 chars
+//..L"------v"
+	L"All",
+	L"Active",
+	L"Compl.",
+//filter button tooltip
+//..L"---------------------------------------------------------------------v"
+	L"Show All",//misc index + 1
+	L"Show Active Quests",
+	L"Show Completed Quests",
+};
+
+STR16 pEncyclopediaSubFilterQuestText[] =
+{//Quest subfilter button text max 7 chars, not used, but needed if any subfilters are added
+//..L"------v"
+	L"",//reserved. insert new active quest subfilters above!
+	L"",//reserved. insert new completed quest subfilters above!
+};
+
 STR16	pEncyclopediaShortInventoryText[] = 
 {
 	L"All", //0
@@ -6180,6 +6356,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Current |Health: %d\n",
 	L"%s|Current |Breath: %d\n",	// TODO.Translate
 	L"%s|Current |Morale: %d\n",
+	L"%s|Current |S|hock: %d\n",//TODO.Translate
+	L"%s|Current |S|uppression Points: %d\n",//TODO.Translate
 	// Full info
 	L"%s|Helmet: %s\n",
 	L"%s|Vest: %s\n",
@@ -4,7 +4,10 @@
 #include "Language Defines.h"

 //----- 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
+// WANNE: Do not disable that define. It is the old encyclopedia which uses a lot of memory
+// The reworked encyclopedia (by Moa) is already coded in the source (without a define)
+//#define ENABLE_ENCYCLOPEDIA		
+
 #define ENABLE_BRIEFINGROOM
 //----- End encyclopedia and Briefing room - by Jazz -----

@@ -432,6 +432,14 @@
 				RelativePath="Credits.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Laptop\Encyclopedia_Data_new.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Laptop\Encyclopedia_new.h"
+				>
+			</File>
 			<File
 				RelativePath="Fade Screen.h"
 				>
@@ -654,6 +662,14 @@
 				RelativePath="Credits.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\Laptop\Encyclopedia_Data_new.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Laptop\Encyclopedia_new.cpp"
+				>
+			</File>
 			<File
 				RelativePath="Fade Screen.cpp"
 				>