Fixed sorting gencode

MarvinKlein1508 · Mar 21, 2024 · 6234cfa · 6234cfa
1 parent 9f066a8
commit 6234cfa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CSGencodes.Core/Models/Weapon.cs b/CSGencodes.Core/Models/Weapon.cs
@@ -53,6 +53,9 @@ public string GetGencode(decimal @float, int pattern, List<AppliedSticker> stick
 
             var sortedStickers = stickers.OrderBy(x => x.PosId).ToList();
 
+            // We have two stickers, both same position
+
+            int addedStickers = 0;
             int currentPos = 0;
             foreach (var sticker in sortedStickers)
             {
@@ -61,14 +64,15 @@ public string GetGencode(decimal @float, int pattern, List<AppliedSticker> stick
                     break;
                 }
 
-                while (sticker.PosId != currentPos)
+                while (sticker.PosId != (currentPos - addedStickers))
                 {
                     sb.Append(" 0 0.00");
                     currentPos++;
                 }
 
                 sb.Append($" {sticker.gen_id} {sticker.Scratched.ToString("0.00", CultureInfo.InvariantCulture)}");
                 currentPos++;
+                addedStickers++;    
             }
 
             string gencode = sb.ToString();

diff --git a/CSGencodes/Pages/Index.razor b/CSGencodes/Pages/Index.razor
@@ -15,12 +15,14 @@
             @if (SelectedWeapon is not null)
             {
                 var inspectLink = inspectService.GenerateInspectLink(SelectedWeapon, Float, Pattern, SelectedStickers);
-
+                 
                 <div class="input-group mb-3">
+
                     <div class="form-floating">
                         <input type="text" value="@SelectedWeapon.GetGencode(Float, Pattern, SelectedStickers)" class="form-control" placeholder="Gencode" id="gencode" />
                         <label for="gencode">Gencode</label>
                     </div>
+
                     @if (!inspectLink.commandMode)
                     {
                         <a class="inspect-btn btn btn-info" href="@inspectLink.url">Inspect</a>
@@ -32,15 +34,15 @@
 
                     <button type="button" class="btn btn-primary" onclick="copyGencode()"><i class="fa-solid fa-copy"></i></button>
                 </div>
-
+                
                 if (inspectLink.commandMode)
                 {
                     <Alert Color="AlertColor.Warning">
                         <strong>Attention!</strong> The generated inspect link is too long. In order to inspect the skin ingame you must paste the following command into the console.
                     </Alert>
 
                     <textarea value="@inspectLink.url" class="d-none" id="inspect-console-command" />
-                }
+                } 
             }
 
             <div class="generator-wrapper">