2.5.1 breaking change: use 'display' option

Kxnrl · Nov 21, 2021 · fe9489d · fe9489d
1 parent 4a2016e
commit fe9489d
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 33 deletions.
diff --git a/configs/database.sql b/configs/database.sql
@@ -169,4 +169,7 @@ ALTER TABLE `store_newlogs` CHANGE `timestamp_` `timestamp` TIMESTAMP NOT NULL D
 
 -- upgrade 2.4
 ALTER TABLE `store_item_child` ADD COLUMN `skin` tinyint(3) NOT NULL DEFAULT '-1' AFTER `arms`;
-ALTER TABLE `store_item_child` ADD COLUMN `hide` tinyint(3) NOT NULL DEFAULT  '1' AFTER `wearf`;
+ALTER TABLE `store_item_child` ADD COLUMN `hide` tinyint(3) NOT NULL DEFAULT  '1' AFTER `wearf`;
+
+-- upgrade 2.5.1
+ALTER TABLE `store_item_child` ADD COLUMN 'display' bit(1) NOT NULL DEFAULT b'1' AFTER `only`;
diff --git a/include/store.inc b/include/store.inc
@@ -44,6 +44,7 @@ enum struct Store_Item
     bool bGiftable;
     bool bCompose;
     bool bVIP;
+    bool bDisplay;
 }
 
 enum struct SkinData_t

diff --git a/modules/store_defaultskin.sp b/modules/store_defaultskin.sp
@@ -4,7 +4,7 @@
 #define PLUGIN_NAME         "Store - Default player skins"
 #define PLUGIN_AUTHOR       "Kyle"
 #define PLUGIN_DESCRIPTION  "store module default player skins"
-#define PLUGIN_VERSION      "2.5.<commit_count>"
+#define PLUGIN_VERSION      "2.5.1.<commit_count>"
 #define PLUGIN_URL          "https://kxnrl.com"
 
 public Plugin myinfo = 

diff --git a/modules/store_givecreditscommand.sp b/modules/store_givecreditscommand.sp
@@ -4,7 +4,7 @@
 #define PLUGIN_NAME         "Store - Give credits command"
 #define PLUGIN_AUTHOR       "Kyle"
 #define PLUGIN_DESCRIPTION  "store module default player skins"
-#define PLUGIN_VERSION      "2.5.<commit_count>"
+#define PLUGIN_VERSION      "2.5.1.<commit_count>"
 #define PLUGIN_URL          "https://kxnrl.com"
 
 #include <store>

diff --git a/modules/store_models.sp b/modules/store_models.sp
@@ -4,7 +4,7 @@
 #define PLUGIN_NAME         "Store - Weapon Skin"
 #define PLUGIN_AUTHOR       "Kyle"
 #define PLUGIN_DESCRIPTION  "store module weapon skin"
-#define PLUGIN_VERSION      "2.5.<commit_count>"
+#define PLUGIN_VERSION      "2.5.1.<commit_count>"
 #define PLUGIN_URL          "https://kxnrl.com"
 
 public Plugin myinfo = 

diff --git a/modules/store_musickit.sp b/modules/store_musickit.sp
@@ -4,7 +4,7 @@
 #define PLUGIN_NAME         "Store - Music Kit"
 #define PLUGIN_AUTHOR       "Kyle"
 #define PLUGIN_DESCRIPTION  "store module music kit for csgo"
-#define PLUGIN_VERSION      "2.5.<commit_count>"
+#define PLUGIN_VERSION      "2.5.1.<commit_count>"
 #define PLUGIN_URL          "https://kxnrl.com"
 
 public Plugin myinfo = 

diff --git a/modules/store_pet.sp b/modules/store_pet.sp
@@ -4,7 +4,7 @@
 #define PLUGIN_NAME         "Store - Pets"
 #define PLUGIN_AUTHOR       "Kyle"
 #define PLUGIN_DESCRIPTION  "store module pets"
-#define PLUGIN_VERSION      "2.5.<commit_count>"
+#define PLUGIN_VERSION      "2.5.1.<commit_count>"
 #define PLUGIN_URL          "https://www.kxnrl.com"
 
 public Plugin myinfo = 

diff --git a/modules/store_randomskin.sp b/modules/store_randomskin.sp
@@ -5,7 +5,7 @@
 #define PLUGIN_NAME         "Store - Random player skins"
 #define PLUGIN_AUTHOR       "Kyle"
 #define PLUGIN_DESCRIPTION  "store module random player skins"
-#define PLUGIN_VERSION      "2.5.<commit_count>"
+#define PLUGIN_VERSION      "2.5.1.<commit_count>"
 #define PLUGIN_URL          "https://kxnrl.com"
 
 public Plugin myinfo = 

diff --git a/modules/store_simplehide.sp b/modules/store_simplehide.sp
@@ -4,7 +4,7 @@
 #define PLUGIN_NAME         "Store - Simple Hide"
 #define PLUGIN_AUTHOR       "Kyle"
 #define PLUGIN_DESCRIPTION  "store module simple hide"
-#define PLUGIN_VERSION      "2.5.<commit_count>"
+#define PLUGIN_VERSION      "2.5.1.<commit_count>"
 #define PLUGIN_URL          "https://kxnrl.com"
 
 #include <sourcemod>

diff --git a/modules/store_weaponskin.sp b/modules/store_weaponskin.sp
@@ -4,7 +4,7 @@
 #define PLUGIN_NAME         "Store - Weapon Skin"
 #define PLUGIN_AUTHOR       "Kyle"
 #define PLUGIN_DESCRIPTION  "store module weapon skin"
-#define PLUGIN_VERSION      "2.5.<commit_count>"
+#define PLUGIN_VERSION      "2.5.1.<commit_count>"
 #define PLUGIN_URL          "https://kxnrl.com"
 
 public Plugin myinfo = 

diff --git a/store.sp b/store.sp
@@ -7,7 +7,7 @@
 #define PLUGIN_NAME         "Store - The Resurrection"
 #define PLUGIN_AUTHOR       "Kyle"
 #define PLUGIN_DESCRIPTION  "a sourcemod store system"
-#define PLUGIN_VERSION      "2.5.<commit_count>"
+#define PLUGIN_VERSION      "2.5.1.<commit_count>"
 #define PLUGIN_URL          "https://kxnrl.com"
 
 public Plugin myinfo = 
@@ -1417,8 +1417,8 @@ void DisplayStoreMenu(int client, int parent = -1, int last = -1)
                 }
                 else if(!g_bInvMode[client])
                 {
-                    // hide personal item
-                    if (strlen(g_Items[i].szSteam) > 8)
+                    // use display setting instead
+                    if (!g_Items[i].bDisplay)
                         continue;
 
                     int m_iStyle = ITEMDRAW_DEFAULT;
@@ -1435,9 +1435,6 @@ void DisplayStoreMenu(int client, int parent = -1, int last = -1)
                         continue;
                     }
 
-                    if(!g_Items[i].bBuyable)
-                        continue;
-
                     if(g_Items[i].iPlans==0)
                         AddMenuItemEx(m_hMenu, m_iStyle, m_szId, "%T", "Item Available", client, g_Items[i].szName, g_Items[i].iPrice);
                     else
@@ -3786,46 +3783,51 @@ public void SQL_LoadChildren(Database db, DBResultSet item_child, const char[] e
         item_child.FetchString(5, m_bitOnly, 2);
         g_Items[g_iItems].bIgnore = (m_bitOnly[0] == 1) ? true : false;
 
-        // Field 6 -> auth
+        // Field 6 -> display
+        char m_bitDisplay[2];
+        item_child.FetchString(6, m_bitDisplay, 2);
+        g_Items[g_iItems].bDisplay = (m_bitDisplay[0] == 1) ? true : false;
+
+        // Field 7 -> auth
         char m_szAuth[256];
-        item_child.FetchString(6, STRING(m_szAuth));
+        item_child.FetchString(7, STRING(m_szAuth));
         g_Items[g_iItems].szSteam[0] = '\0';
         if(strcmp(m_szAuth, "ITEM_NOT_PERSONAL") != 0)
             strcopy(g_Items[g_iItems].szSteam, sizeof(Store_Item::szSteam), m_szAuth);
 
-        // Field 7 -> vip
+        // Field 8 -> vip
         char m_bitVIP[2];
-        item_child.FetchString(7, m_bitVIP, 2);
+        item_child.FetchString(8, m_bitVIP, 2);
         g_Items[g_iItems].bVIP = (m_bitVIP[0] == 1) ? true : false;
 
-        // Field 8 -> name
-        item_child.FetchString(8, g_Items[g_iItems].szName, sizeof(Store_Item::szName));
+        // Field 9 -> name
+        item_child.FetchString(9, g_Items[g_iItems].szName, sizeof(Store_Item::szName));
 
-        // Field 9 -> lvls
-        g_Items[g_iItems].iLevels = item_child.FetchInt(9);
+        // Field 10 -> lvls
+        g_Items[g_iItems].iLevels = item_child.FetchInt(10);
         if (g_Items[g_iItems].iLevels > MAX_SKIN_LEVEL) // override to max
             g_Items[g_iItems].iLevels = MAX_SKIN_LEVEL;
 
-        // Field 10 -> desc
+        // Field 11 -> desc
         char m_szDesc[128];
-        item_child.FetchString(10, STRING(m_szDesc));
+        item_child.FetchString(11, STRING(m_szDesc));
         g_Items[g_iItems].szDesc[0] = '\0';
         if(StrContains(m_szDesc, "ITEM_NO") == -1)
             strcopy(g_Items[g_iItems].szDesc, sizeof(Store_Item::szDesc), m_szDesc);
 
-        // Field 11 -> case
-        int caseType = item_child.FetchInt(11);
+        // Field 12 -> case
+        int caseType = item_child.FetchInt(12);
         g_Items[g_iItems].iCaseType = caseType;
 
-        // Field 12 -> Compose
+        // Field 13 -> Compose
         char m_bitCompose[2];
-        item_child.FetchString(12, m_bitCompose, 2);
+        item_child.FetchString(13, m_bitCompose, 2);
         g_Items[g_iItems].bCompose = (m_bitCompose[0] == 1) ? true : false;
 
-        // Field 13,14,15 -> price
-        int price_1d = item_child.FetchInt(13);
-        int price_1m = item_child.FetchInt(14);
-        int price_pm = item_child.FetchInt(15);
+        // Field 14,15,16 -> price
+        int price_1d = item_child.FetchInt(14);
+        int price_1m = item_child.FetchInt(15);
+        int price_pm = item_child.FetchInt(16);
 
         // skip m_nBody
         // #18