fix sticker slot conflicts & gencode extra-arg 500 error

Author: johnqherman

src/Commands/CmdCombo.cs

@@ -44,14 +44,14 @@ private async Task FetchAndGiveComboAsync(string gencode, int? userId, ulong ste
         foreach (var part in parts)
         {
             var defIndex = (ushort)part.ItemId;
-            var stickers = new[]
+            var stickers = DeduplicateStickerSlots(new[]
             {
                 new StickerSlot(part.Sticker1Slot, part.Sticker1Id, part.Sticker1Value, part.Sticker1X, part.Sticker1Y, part.Sticker1R),
                 new StickerSlot(part.Sticker2Slot, part.Sticker2Id, part.Sticker2Value, part.Sticker2X, part.Sticker2Y, part.Sticker2R),
                 new StickerSlot(part.Sticker3Slot, part.Sticker3Id, part.Sticker3Value, part.Sticker3X, part.Sticker3Y, part.Sticker3R),
                 new StickerSlot(part.Sticker4Slot, part.Sticker4Id, part.Sticker4Value, part.Sticker4X, part.Sticker4Y, part.Sticker4R),
                 new StickerSlot(part.Sticker5Slot, part.Sticker5Id, part.Sticker5Value, part.Sticker5X, part.Sticker5Y, part.Sticker5R),
-            }.Where(s => s.Id != 0).ToArray();
+            }.Where(s => s.Id != 0).ToArray());
 
             if (IsGloveDefIndex(defIndex))
             {

src/Commands/CmdGen.cs

@@ -18,7 +18,7 @@ private void CmdGen(CCSPlayerController? player, CommandInfo info)
             return;
         }
 
-        var gencode = info.ArgString.Trim();
+        var gencode = info.ArgString.Contains("//") ? info.ArgString.Trim() : info.ArgByIndex(1);
         var userId  = player.UserId;
         var steamId = player.SteamID;
 
@@ -90,14 +90,14 @@ private async Task FetchAndGiveAsync(string gencode, int? userId, ulong steamId)
                        CultureInfo.InvariantCulture, out var apiWear);
 
         GiveItem(apiDefIndex, apiPaintKit, apiSeed, apiWear,
-            new[]
+            DeduplicateStickerSlots(new[]
             {
                 new StickerSlot(detail.Sticker1Slot, detail.Sticker1Id, detail.Sticker1Value, detail.Sticker1X, detail.Sticker1Y, detail.Sticker1R),
                 new StickerSlot(detail.Sticker2Slot, detail.Sticker2Id, detail.Sticker2Value, detail.Sticker2X, detail.Sticker2Y, detail.Sticker2R),
                 new StickerSlot(detail.Sticker3Slot, detail.Sticker3Id, detail.Sticker3Value, detail.Sticker3X, detail.Sticker3Y, detail.Sticker3R),
                 new StickerSlot(detail.Sticker4Slot, detail.Sticker4Id, detail.Sticker4Value, detail.Sticker4X, detail.Sticker4Y, detail.Sticker4R),
                 new StickerSlot(detail.Sticker5Slot, detail.Sticker5Id, detail.Sticker5Value, detail.Sticker5X, detail.Sticker5Y, detail.Sticker5R),
-            }.Where(s => s.Id != 0).ToArray(),
+            }.Where(s => s.Id != 0).ToArray()),
             detail.KeyChainId, detail.KeyChainPattern, detail.KeyChainX, detail.KeyChainY, detail.KeyChainZ,
             detail.StatTrakEnabled == "1", detail.StatTrakValue, detail.NameTag,
             userId, steamId);

src/Helpers/GiveScheduler.cs

@@ -72,4 +72,28 @@ private void ScheduleWeaponGive(CCSPlayerController p, ulong steamId, string giv
         });
     }
 
+    private static StickerSlot[] DeduplicateStickerSlots(StickerSlot[] stickers)
+    {
+        var used   = new HashSet<int>();
+        var result = new StickerSlot[stickers.Length];
+        int next   = 0;
+
+        for (int i = 0; i < stickers.Length; i++)
+        {
+            var s = stickers[i];
+            if (!used.Contains(s.Slot))
+            {
+                used.Add(s.Slot);
+                result[i] = s;
+            }
+            else
+            {
+                while (next < 5 && used.Contains(next)) next++;
+                used.Add(next);
+                result[i] = s with { Slot = next };
+            }
+        }
+
+        return result;
+    }
 }