Skip to content

Commit

Permalink
Changed handling of restricted items #103
Browse files Browse the repository at this point in the history 
Changed handling of restricted items when players don't have access to them anymore #103

Added the "sm_store_sell_restricted" cvar and prevented players from equipping restricted items
  • Loading branch information
@azalty @nuclearsilo583
azalty authored and nuclearsilo583 committed Feb 2, 2023
1 parent a93fa66 commit 67a15a0
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 12 deletions.
2 changes: 2 additions & 0 deletions addons/sourcemod/scripting/store/cvars.sp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ int g_cvarPreview = -1;
int g_cvarAdminFlag = -1;
int g_cvarSaveOnDeath = -1;
int g_cvarCreditMessages = -1;
int g_cvarSellRestricted = -1;
int g_cvarShowVIP = -1;
int g_cvarShowSTEAM = -1;
int g_cvarLogging = -1;
Expand Down Expand Up @@ -63,6 +64,7 @@ void Store_Cvars_OnPluginStart()
g_cvarPreview = RegisterConVar("sm_store_preview_enable", "1", "Enable/disable preview button.", TYPE_INT);
g_cvarSaveOnDeath = RegisterConVar("sm_store_save_on_death", "0", "Enable/disable client data saving on client death.", TYPE_INT);
g_cvarCreditMessages = RegisterConVar("sm_store_credit_messages", "1", "Enable/disable messages when a player earns credits.", TYPE_INT);
g_cvarSellRestricted = RegisterConVar("sm_store_sell_restricted", "0", "Enable/disable auto-selling restricted items if players don't have access to them anymore.", TYPE_INT);

//g_cvarChatTag = RegisterConVar("sm_store_chat_tag", "[Store] ", "The chat tag to use for displaying messages.", TYPE_STRING);
g_cvarChatTag = AutoExecConfig_CreateConVar("sm_store_chat_tag_plugins", "[Store] ", "The chat tag to use for displaying messages.");
Expand Down
4 changes: 2 additions & 2 deletions addons/sourcemod/scripting/store/menus/item_menu.sp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ public void DisplayItemMenu(int client,int itemid)
if(g_eTypeHandlers[g_eItems[itemid].iHandler].bEquipable)
{
if(!m_bEquipped)
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "0", "%t", "Item Equip");
AddMenuItemEx(m_hMenu, GetClientPrivilege(target, g_eItems[itemid].iFlagBits, m_iFlags) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED, "0", "%t", "Item Equip");
else
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "3", "%t", "Item Unequip");
}
else
{
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "0", "%t", "Item Use");
AddMenuItemEx(m_hMenu, GetClientPrivilege(target, g_eItems[itemid].iFlagBits, m_iFlags) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED, "0", "%t", "Item Use");
}
//
if (g_eItems[itemid].bPreview)
Expand Down
4 changes: 2 additions & 2 deletions addons/sourcemod/scripting/store/menus/preview_menu.sp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ public void DisplayPreviewMenu(int client, int itemid)
{
if(g_eTypeHandlers[g_eItems[itemid].iHandler].bEquipable)
if(!m_bEquipped)
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "0", "%t", "Item Equip");
AddMenuItemEx(m_hMenu, GetClientPrivilege(target, g_eItems[itemid].iFlagBits, m_iFlags) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED, "0", "%t", "Item Equip");
else
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "3", "%t", "Item Unequip");
else
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "0", "%t", "Item Use");
AddMenuItemEx(m_hMenu, GetClientPrivilege(target, g_eItems[itemid].iFlagBits, m_iFlags) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED, "0", "%t", "Item Use");
}
// Player don't own the item
else if (!g_bInvMode[client] && !Store_HasClientItem(target, itemid))
Expand Down
11 changes: 9 additions & 2 deletions addons/sourcemod/scripting/store/sql.sp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,18 @@ public void SQLCallback_LoadClientInventory_Equipment(Handle owner, Handle hndl,
//PrintToChat(client, "You dont have item/ unequip");
Store_UnequipItem(client, m_iUniqueId);
}
// Client has item but VIP period is expired. Sell the item.
// Client has item but VIP period is expired.
else if(Store_HasClientItem(client, m_iUniqueId) && !GetClientPrivilege(client, g_eItems[m_iUniqueId].iFlagBits))
{
//PrintToChat(client, "You ahve have item but no flag/ Sold.");
Store_SellItem(client, m_iUniqueId);
if (g_eCvars[g_cvarSellRestricted].aCache)
{
Store_SellItem(client, m_iUniqueId); // Sell the item.
}
else
{
Store_UnequipItem(client, m_iUniqueId); // Just prevent the player from equipping it.
}
}
// Client has item and has access to the item.
else
Expand Down
21 changes: 15 additions & 6 deletions addons/sourcemod/scripting/store_combine.sp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ int g_cvarPreview = -1;
int g_cvarAdminFlag = -1;
int g_cvarSaveOnDeath = -1;
int g_cvarCreditMessages = -1;
int g_cvarSellRestricted = -1;
int g_cvarShowVIP = -1;
int g_cvarShowSTEAM = -1;
int g_cvarLogging = -1;
Expand Down Expand Up @@ -304,6 +305,7 @@ public void OnPluginStart()
g_cvarPreview = RegisterConVar("sm_store_preview_enable", "1", "Enable/disable preview button.", TYPE_INT);
g_cvarSaveOnDeath = RegisterConVar("sm_store_save_on_death", "0", "Enable/disable client data saving on client death.", TYPE_INT);
g_cvarCreditMessages = RegisterConVar("sm_store_credit_messages", "1", "Enable/disable messages when a player earns credits.", TYPE_INT);
g_cvarSellRestricted = RegisterConVar("sm_store_sell_restricted", "0", "Enable/disable auto-selling restricted items if players don't have access to them anymore.", TYPE_INT);

//g_cvarChatTag = RegisterConVar("sm_store_chat_tag", "[Store] ", "The chat tag to use for displaying messages.", TYPE_STRING);
g_cvarChatTag = AutoExecConfig_CreateConVar("sm_store_chat_tag_plugins", "[Store] ", "The chat tag to use for displaying messages.");
Expand Down Expand Up @@ -2583,13 +2585,13 @@ public void DisplayItemMenu(int client,int itemid)
if(g_eTypeHandlers[g_eItems[itemid].iHandler].bEquipable)
{
if(!m_bEquipped)
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "0", "%t", "Item Equip");
AddMenuItemEx(m_hMenu, GetClientPrivilege(target, g_eItems[itemid].iFlagBits, m_iFlags) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED, "0", "%t", "Item Equip");
else
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "3", "%t", "Item Unequip");
}
else
{
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "0", "%t", "Item Use");
AddMenuItemEx(m_hMenu, GetClientPrivilege(target, g_eItems[itemid].iFlagBits, m_iFlags) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED, "0", "%t", "Item Use");
}
//
if (g_eItems[itemid].bPreview)
Expand Down Expand Up @@ -2657,11 +2659,11 @@ public void DisplayPreviewMenu(int client, int itemid)
{
if(g_eTypeHandlers[g_eItems[itemid].iHandler].bEquipable)
if(!m_bEquipped)
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "0", "%t", "Item Equip");
AddMenuItemEx(m_hMenu, GetClientPrivilege(target, g_eItems[itemid].iFlagBits, m_iFlags) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED, "0", "%t", "Item Equip");
else
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "3", "%t", "Item Unequip");
else
AddMenuItemEx(m_hMenu, ITEMDRAW_DEFAULT, "0", "%t", "Item Use");
AddMenuItemEx(m_hMenu, GetClientPrivilege(target, g_eItems[itemid].iFlagBits, m_iFlags) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED, "0", "%t", "Item Use");
}
// Player don't own the item
else if (!g_bInvMode[client] && !Store_HasClientItem(target, itemid))
Expand Down Expand Up @@ -3725,11 +3727,18 @@ public void SQLCallback_LoadClientInventory_Equipment(Handle owner, Handle hndl,
//PrintToChat(client, "You dont have item/ unequip");
Store_UnequipItem(client, m_iUniqueId);
}
// Client has item but VIP period is expired. Sell the item.
// Client has item but VIP period is expired.
else if(Store_HasClientItem(client, m_iUniqueId) && !GetClientPrivilege(client, g_eItems[m_iUniqueId].iFlagBits))
{
//PrintToChat(client, "You ahve have item but no flag/ Sold.");
Store_SellItem(client, m_iUniqueId);
if (g_eCvars[g_cvarSellRestricted].aCache)
{
Store_SellItem(client, m_iUniqueId); // Sell the item.
}
else
{
Store_UnequipItem(client, m_iUniqueId); // Just prevent the player from equipping it.
}
}
// Client has item and has access to the item.
else
Expand Down

0 comments on commit 67a15a0

Please sign in to comment.