Browse Source

Combine sum change and hide added stickers

Tigran 3 years ago
parent
commit
aafa9ff1ac

+ 3 - 1
CardCollector/Commands/InlineQuery/ShowCombineStickers.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using CardCollector.Controllers;
 using CardCollector.DataBase.Entity;
 using CardCollector.Resources;
@@ -17,6 +18,7 @@ namespace CardCollector.Commands.InlineQuery
             var module = User.Session.GetModule<CombineModule>();
             // Получаем список стикеров
             var stickersList = await User.GetStickersList(Query, module.Tier);
+            stickersList = stickersList.Except(module.CombineList.Keys);
             var results = stickersList.ToTelegramResults(Command.select_sticker);
             // Посылаем пользователю ответ на его запрос
             await MessageController.AnswerInlineQuery(InlineQueryId, results);

+ 9 - 2
CardCollector/Session/Modules/CombineModule.cs

@@ -14,9 +14,16 @@ namespace CardCollector.Session.Modules
         
         public int CalculateCombinePrice()
         {
-            var coinsSum = CombineList.Sum(pair => 1440 / pair.Key.IncomeTime * pair.Key.Income * pair.Value);
+            /*var coinsSum = CombineList.Sum(pair => 1440 / pair.Key.IncomeTime * pair.Key.Income * pair.Value);
             var multiplier = SelectedSticker.Tier * 0.25 + 1;
-            return (int)(coinsSum * multiplier);
+            return (int)(coinsSum * multiplier);*/
+            return Tier switch
+            {
+                1 => 200,
+                2 => 500,
+                3 => 1200,
+                _ => 0
+            };
         }
         
         public int CombineCount => CombineList.Values.Sum();