R1KO · Oct 10, 2026 · Oct 10, 2026 · Oct 10, 2026 · Oct 10, 2026 · Oct 10, 2026
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.smx
 .sourceknight
 plugins/
+.omc/
diff --git a/AGENTS.md b/AGENTS.md
@@ -8,39 +8,43 @@
 - `-E` = warnings are errors. Fix every warning, including deprecation ones. SM 1.10 is the strictest parser (e.g. missing `;`), so code must build there too.
 - Alt: `sourceknight build` (`sourceknight.yaml`, SM 1.13). It ignores spcomp's exit code — check output for `error`.
 - Never commit `*.smx`, `plugins/`, `.sourceknight`.
-
-## Git
-- `dev` is the integration branch: branch from `dev`, merge back into `dev`. `master` is for releases.
-- LF line endings only (enforced by `.gitattributes`); don't introduce CRLF.
+- Git: `dev` is the integration branch: branch from `dev`, merge back into `dev`. `master` is for releases. LF line endings only (`.gitattributes`).
 
 ## Layout
 - `scripting/VIP_Core.sp` — entry point; `#include`s every `vip/*.sp` into ONE compilation unit (order matters: Global → Debug → ... → API → CMD → Clients). New file = add `#include` there.
-- Compile-time switches in `VIP_Core.sp`: `DEBUG_MODE`, `USE_ADMINMENU` (gates `AdminMenu.sp` + `vip/adminmenu/*`), `USE_MORE_SERVERS`.
+- Compile-time switches in `VIP_Core.sp`: `DEBUG_MODE`, `USE_ADMINMENU` (gates `AdminMenu.sp` + `vip/adminmenu/*`), `USE_MORE_SERVERS`, `USE_CLIENTPREFS` (toggle statuses in cookies vs `vip_storage`; status I/O only via `Features_GetSavedStatus`/`Features_SaveStatus`).
 - `vip/Global.sp` — all globals, macros (`SZF`, `UID/CID`, `SET_BIT/UNSET_BIT`), client flag bits (`IS_VIP`, `IS_LOADED`, ...), core state bits (`IS_STARTED`, `IS_MySQL`, `IS_LOADING`).
 - `vip/API.sp` — forwards (`API_SetupForwards`, `CreateForward_*`) and natives (`AskPluginLoad2`, `RegNative(X)` → `VIP_X` bound to `Native_X`).
-- `vip/Database.sp` — connection, schema, queries. `UTIL.sp` — shared helpers; check here before writing new ones.
-- `vip/Clients.sp` — client load/unload lifecycle, spawn handling. `Features.sp` — feature registry.
-- `include/vip_core.inc` — PUBLIC API for third-party modules.
-- `data/vip/cfg/*.ini` — runtime configs (groups, info, sort_menu, times). `translations/vip_core.phrases.txt` — all user-facing strings.
+- `vip/Database.sp` — connection, schema, queries. `UTIL.sp` — shared helpers; check here before writing new ones. `Clients.sp` — client load/unload lifecycle, spawn. `Features.sp` — feature registry.
+- `include/vip_core.inc` — PUBLIC API for third-party modules. `data/vip/cfg/*.ini` — runtime configs (groups, info, sort_menu, times). `translations/vip_core.phrases.txt` — all user-facing strings.
 
 ## Public API rules (vip_core.inc)
-- Third-party modules depend on it: never change existing native/forward signatures or semantics. Add new params with defaults or add new natives.
+- Third-party modules depend on it: never change existing native/forward signatures or semantics. Add new params with defaults or add new natives. Deprecate via `#pragma deprecated`, don't delete (see `docs/update_modules.md`).
 - New native: implement `Native_X` in API.sp, `RegNative(X)` in `AskPluginLoad2`, declare in `.inc`, add `MarkNativeAsOptional("VIP_X")` in `__pl_vip_core_SetNTVOptional`.
 - New forward: `static GlobalForward` field + `new GlobalForward(...)` in `API_SetupForwards` + `CreateForward_*` wrapper + `forward` declaration with doc comment in `.inc`.
-- Deprecate via `#pragma deprecated`, don't delete (see `update_modules.md`).
 
 ## Database
 - Config name `vip_core` in databases.cfg → MySQL; otherwise falls back to local SQLite. Every query must work on BOTH.
 - Schemas differ: MySQL has `sid` column (PK `account_id, sid`), SQLite has no `sid`. Use `g_szSID` (empty on SQLite) when filtering by server.
 - MySQL uses `utf8mb4`. Escape user strings with `g_hDatabase.Escape`. All queries are async (`g_hDatabase.Query` + callback); check `szError` in callbacks.
-- Players are keyed by `account_id` (SteamID AccountID), not userid/client index.
+- Players are keyed by `account_id` (SteamID AccountID), not userid/client index. Never store data under `account_id` 0 (unauthorized client).
+- `vip/Storage.sp` — per-player key/value cache over `vip_storage` (filtered by `sm_vip_storage_id` on MySQL), loaded on connect, written on disconnect.
+
+## Code style (new/changed code; legacy deviations are not a reason to copy them)
+- `#pragma semicolon 1`, `#pragma newdecls required`. Tabs, no trailing whitespace. Allman braces, always braced, also single-statement `if`/`for` and `case` bodies (`case MenuAction_End: delete hMenu;` is the only one-liner).
+- Space after keywords: `if (`, `for (`, `while (`, `switch (`. `++i` in loops. `!bFlag`, not `bFlag == false`. Buffers: `SZF(szBuf)`, not `szBuf, sizeof(szBuf)`; `FormatEx` unless formatting a buffer into itself.
+- Names: locals/params Hungarian `iClient`, `szName`, `hMenu`, `bFlag`, `fTime`, `eStatus`; globals `g_` + prefix (`g_hDatabase`, `g_szSID`), cvars `g_CVAR_*`; macros/consts `UPPER_SNAKE`, StringMap keys `KEY_*` / `DATA_KEY_*`.
+- Functions: `PascalCase` with file prefix: `Clients_*`, `Features_*`, `Storage_*`, `DB_*`, `UTIL_*`, `API_*`. Callbacks: `SQL_Callback_*`, `SQL_TxnCallback_*`, `Timer_*`, `MenuHandler_*`, `Event_*`; commands `*_CMD`; natives `Native_*`; forward wrappers `CreateForward_*`.
+- SQL: backticks around identifiers, single quotes for values, trailing `;`, user strings via `g_hDatabase.Format`/`Escape`. Callbacks: `if (hResult == null || szError[0]) { LogError("<Callback>: %s", szError); return; }`, free the DataPack on every path.
+- File-private state/helpers are `static`. Never pass already formatted text as a format string: `PrintToServer("%s", szMsg)`, not `PrintToServer(szMsg)`.
+
+## Comments
+- Explain *why*, never restate *what* the code does. A comment doesn't excuse unclear code: rename/restructure first; if a clear comment is hard to write, the code is the problem.
+- Comment what a reader would trip over: unidiomatic code, SourceMod quirks, ordering constraints, odd-looking bug fixes. Mark unfinished parts `// TODO: <what and why>`. Link the source of copied code and external refs (SM docs, AlliedModders) where they help.
 
 ## Conventions
-- `#pragma semicolon 1`, `#pragma newdecls required`. Tabs. Hungarian-ish names: `iClient`, `szName`, `hMenu`, `bFlag`, globals `g_*`, cvars `g_CVAR_*`.
 - Pass client across async boundaries as userid (`UID`/`CID`), never raw index.
 - `GLOBAL_TRIE` / `GLOBAL_INFO` are index `[0]` of per-client arrays — slot 0 = global, not a player.
 - Use methodmaps (`StringMap`, `Cookie`, `KeyValues`, `delete`), not legacy procedural calls (`CreateTrie`, `SetClientCookie`, `CloseHandle`, `Kv*`).
 - Debug logging via `DBG_*` / `DebugMessage` functions from `Debug.sp` (empty unless `DEBUG_MODE 1`); calls still need a trailing `;`.
-- Any new user-facing text → new phrase in `vip_core.phrases.txt` with at least `en` and `ru`.
-- Comments and cvar descriptions are mostly Russian; either language is fine, keep the surrounding style.
-- Bump `VIP_VERSION` in `VIP_Core.sp` only when asked; changelog lives in `updates.md`.
+- English only in code, comments, cvar descriptions, log/error strings and docs. Other languages live only in `translations/*.phrases.txt` and the per-language values of `data/vip/cfg/*.ini`. Any new user-facing text → new phrase in `vip_core.phrases.txt` with at least `en` and `ru`. Bump `VIP_VERSION` in `VIP_Core.sp` only when asked; changelog lives in `updates.md`.
diff --git a/README.md b/README.md
@@ -7,20 +7,15 @@ Download latest vesrion [https://github.com/R1KO/VIP-Core/releases](Releases)
 
 ## [VIP] Core
 
-RU: Плагин позволяет выдавать игрокам VIP-статус на определенный срок или навсегда.
-Учитывая модульную систему плагина вы всегда имеете возможность расширить функционал плагина.
-Плагин очень гибкий и удобный в настройке, может работать как с SQLite так и с MySQL базой.
-
-
-[RU: [VIP] Core Официальная тема на HlMod.ru](http://hlmod.ru/resources/vip-core.245/)
-
-[RU: Документация](https://r1ko.github.io/VIP-Core/)
-
-
-EN: This plugin allows you to give VIP status to players for a specific period or forever. 
+This plugin allows you to give VIP status to players for a specific period or forever. 
 Given the plugin’s modular system, the functionality can always be expanded. 
 The plugin is very flexible and easy to configure, it can work with both SQLite and MySQL database.
 
-[EN: [VIP] Core official theme on HlMod.ru](http://hlmod.ru/resources/vip-core.245/)
+[[VIP] Core official thread on HlMod.ru](http://hlmod.ru/resources/vip-core.245/)
+
+[Documentation](https://r1ko.github.io/VIP-Core/)
 
-[EN: Documentation](https://r1ko.github.io/VIP-Core/)
+### Guides
+- [Module update guide](docs/update_modules.md)
+- [Issue labels](docs/issue_labels.md)
+- [Changelog](updates.md)
diff --git a/addons/sourcemod/data/vip/cfg/groups.ini b/addons/sourcemod/data/vip/cfg/groups.ini
@@ -1,8 +1,8 @@
 "VIP_GROUPS"
 {
-	"vip1" 	// Имя группы | Group name
+	"vip1" 	// Group name
 	{
-		// Опции (основные VIP-модули) | Options (VIP Core Modules)
+		// Options (VIP Core Modules)
 	}
 
 	"vip2"

diff --git a/addons/sourcemod/data/vip/cfg/info.ini b/addons/sourcemod/data/vip/cfg/info.ini
@@ -1,25 +1,25 @@
 "VIP_INFO"
 {
-	"connect_info_time"	// Сообщение для VIP-игрока при входе на сервер (когда вип на время) | Message for the VIP player when entering the server (when the VIP is on time)
+	"connect_info_time"	// Message for the VIP player when entering the server (timed VIP)
 	{
-		//	{NAME}		- Ник игрока | Player Nickname
-		//	{GROUP}		- Группа игрока | Player Group
-		//	{TIMELEFT}	- Через сколько истекает VIP-статус | How long does it take for VIP status to expire?
-		//	{EXPIRES}	- Когда истекает VIP-статус | When VIP status expires
+		//	{NAME}		- Player Nickname
+		//	{GROUP}		- Player Group
+		//	{TIMELEFT}	- Time left until VIP status expires
+		//	{EXPIRES}	- When VIP status expires
 
-		"chat"		// Сообщение в чат | Chat Message
+		"chat"		// Chat Message
 		{
 			"ru"		"{DEFAULT}Здравствуйте, {GREEN}{NAME}{DEFAULT}! Вы являетесь {LIGHTGREEN}VIP-игроком{DEFAULT}. Ваш VIP статус истекает {GREEN}{EXPIRES}"
 			"en"		"{DEFAULT}Hello, {GREEN}{NAME}{DEFAULT}! You have {LIGHTGREEN}VIP features {DEFAULT}for {GREEN}{EXPIRES}"
 			"pt"		"{DEFAULT}Olá, {GREEN}{NAME}{DEFAULT}! Você tem {LIGHTGREEN}status VIP {DEFAULT}para {GREEN}{EXPIRES}"
 			"fr"		"{DEFAULT}Bonjour, {GREEN}{NAME}{DEFAULT}! Vous avez un {LIGHTGREEN}statut VIP {DEFAULT}pendant {GREEN}{EXPIRES}"
 		}
-		"menu"		// Сообщение в меню | Menu Message
+		"menu"		// Menu Message
 		{
-			"time"		"12"	// Через сколько секунд меню будет закрыто автоматически (0 - пока игрок сам не закроет) | After how many seconds the menu will be closed automatically (0 - until the player closes himself)
+			"time"		"12"	// After how many seconds the menu will be closed automatically (0 - until the player closes it)
 			"ru"
 			{
-				// Пукнты меню | Menu Items
+				// Menu Items
 				"item"	"Вы имеете VIP-статус"
 				"item"	"SPACER"
 				"item"	"Ник: {NAME}"
@@ -56,24 +56,24 @@
 			}
 		}
 	}
-	"connect_info_perm"	// Сообщение для VIP-игрока при входе на сервер (когда вип навсегда) | A message for the VIP player when entering the server (when the VIP is forever)
+	"connect_info_perm"	// A message for the VIP player when entering the server (when the VIP is forever)
 	{
-		//	{NAME}	- Ник игрока | Player Nickname
-		//	{GROUP}	- Группа игрока | Player Group
+		//	{NAME}	- Player Nickname
+		//	{GROUP}	- Player Group
 
-		"chat"		// Сообщение в чат | Chat Message
+		"chat"		// Chat Message
 		{
 			"ru"		"{DEFAULT}Здравствуйте, {GREEN}{NAME}{DEFAULT}! Вы являетесь {LIGHTGREEN}VIP-игроком{DEFAULT}."
 			"en"		"{DEFAULT}Hello, {GREEN}{NAME}{DEFAULT}! You have  {LIGHTGREEN}VIP features{DEFAULT}."
 			"pt"		"{DEFAULT}Olá, {GREEN}{NAME}{DEFAULT}! Você tem  {LIGHTGREEN}status VIP{DEFAULT}."
 			"fr"		"{DEFAULT}Bonjour, {GREEN}{NAME}{DEFAULT}! Vous avez un {LIGHTGREEN}statut VIP{DEFAULT}."
 		}
-		"menu"		// Сообщение в меню | Menu Message
+		"menu"		// Menu Message
 		{
-			"time"		"30"	// Через сколько секунд меню будет закрыто автоматически (0 - пока игрок сам не закроет) | After how many seconds the menu will be closed automatically (0 - until the player closes himself)
+			"time"		"30"	// After how many seconds the menu will be closed automatically (0 - until the player closes it)
 			"ru"
 			{
-				// Пукнты меню | Menu Items
+				// Menu Items
 				"item"	"Вы имеете VIP-статус"
 				"item"	"Группа: {GROUP}"
 			}
@@ -94,14 +94,14 @@
 			}
 		}
 	}
-	"no_access_info"	// Сообщение об остутствии VIP-статуса
+	"no_access_info"	// Message shown when the player has no VIP status
 	{
-		"menu"		// Сообщение в меню | Menu Message
+		"menu"		// Menu Message
 		{
-			"time"		"12"	// Через сколько секунд меню будет закрыто автоматически (0 - пока игрок сам не закроет) | After how many seconds the menu will be closed automatically (0 - until the player closes himself)
+			"time"		"12"	// After how many seconds the menu will be closed automatically (0 - until the player closes it)
 			"ru"
 			{
-				// Пукнты меню | Menu Items
+				// Menu Items
 				"item"	"У вас нет доступа к этому меню"
 				"item"	"Чтобы приобрести VIP-статус"
 				"item"	"Oбратитесь к администратору"
@@ -126,22 +126,22 @@
 			}
 		}
 
-		"url"		// Ссылка, которую нужно открыть | Link to open
+		"url"		// Link to open
 		{
 			"ru"		"http://mysite.ru/vip/no_access.php?lang=ru"
 			"en"		"http://mysite.ru/vip/no_access.php?lang=en"
 			"pt"		"http://mysite.ru/vip/no_access.php?lang=pt"
 			"fr"		"http://mysite.ru/vip/no_access.php?lang=fr"
 		}
 	}
-	"expired_info"	// Сообщение об истечении VIP-статуса
+	"expired_info"	// Message shown when the VIP status expires
 	{
-		"menu"	// Сообщение в меню | Menu Message
+		"menu"	// Menu Message
 		{
-			"time"		"12"	// Через сколько секунд меню будет закрыто автоматически (0 - пока игрок сам не закроет) | After how many seconds the menu will be closed automatically (0 - until the player closes himself)
+			"time"		"12"	// After how many seconds the menu will be closed automatically (0 - until the player closes it)
 			"ru"
 			{
-				// Пукнты меню | Menu Items
+				// Menu Items
 				"item"	"Срок вашего VIP-статуса истек"
 				"item"	"Чтобы вновь приобрести VIP-статус"
 				"item"	"Oбратитесь к администратору"

diff --git a/addons/sourcemod/data/vip/cfg/times.ini b/addons/sourcemod/data/vip/cfg/times.ini
@@ -1,8 +1,8 @@
 "TIMES"
 {
-	"0"		// Время в секундах | Time in seconds
+	"0"		// Time in seconds
 	{
-		"ru"	"Навсегда"		// Отображение в меню | Display in the menu
+		"ru"	"Навсегда"		// Display in the menu
 		"en"	"Permanent"
 		"pt"	"Permanente"
 		"fr"	"Permanent"

diff --git a/addons/sourcemod/scripting/VIP_Core.sp b/addons/sourcemod/scripting/VIP_Core.sp
@@ -7,15 +7,17 @@
 #include <clientprefs>
 
 #if !defined VIP_VERSION
-#define VIP_VERSION		"3.0.7 R"
+#define VIP_VERSION		"3.1.0 R"
 #endif
 
 
-#define DEBUG_MODE			0	// Режим отладки
+#define DEBUG_MODE			0	// Debug mode
 
-#define USE_ADMINMENU		1	// Включение админ-меню для управления VIP
+#define USE_ADMINMENU		1	// Admin menu for managing VIPs
 
-#define USE_MORE_SERVERS	1	// Включить/Отключить режим при котором если ID сервера у игрока 0 - то VIP будет работать на всех серверах
+#define USE_MORE_SERVERS	1	// A VIP with server ID 0 is active on all servers
+
+#define USE_CLIENTPREFS		0	// Store VIP feature statuses in cookies (1) or in the vip_storage table (0, old cookies are migrated automatically)
 
 
 public Plugin myinfo =
@@ -31,6 +33,7 @@ public Plugin myinfo =
 #include "vip/Downloads.sp"
 #include "vip/Colors.sp"
 #include "vip/UTIL.sp"
+#include "vip/Storage.sp"
 #include "vip/Features.sp"
 #include "vip/Sounds.sp"
 #include "vip/Info.sp"
@@ -74,6 +77,7 @@ public void OnPluginStart()
 	ITEM_DRAW = hDataPack.Position;
 	delete hDataPack;
 
+	API_SetupForwards();
 	ReadConfigs();
 
 	VIPMenu_Setup();
@@ -82,7 +86,6 @@ public void OnPluginStart()
 	#endif
 
 	Cvars_Setup();
-	API_SetupForwards();
 
 	HookEvent("player_spawn", Event_PlayerSpawn);
 	HookEvent("player_death", Event_PlayerDeath);
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     *.smx
     .sourceknight
     plugins/
+    .omc/