Catalog Implementation & Various related fixes

Config/Packets/PRODUCTION-201510201205-42435347/PRODUCTION-201510201205-42435347.outgoing

@@ -63,8 +63,9 @@ CataloguePageMessageComposer=1795
 CatalogueClubPageMessageComposer=62
 CatalogOfferMessageComposer=2976
 CatalogueOfferConfigMessageComposer=3673
+CataloguePurchaseNotAllowed=3089
 PurchaseOKMessageComposer=837
-CatalogPurchaseNotAllowedMessageComposer=2819
+CatalogPurchaseErrorMessageComposer=2819
 CatalogLimitedItemSoldOutMessageComposer=3958
 SellablePetBreedsMessageComposer=2507
 ReloadEcotronMessageComposer=2584

Yupi.Controller/AchievementManager.cs

@@ -80,10 +80,10 @@ public bool ProgressUserAchievement(Habbo user, string achievementGroup, int pro
 
         public void TryProgressHabboClubAchievements(Habbo session)
         {
-            if (!session.Info.Subscription.IsValid())
-                return;
-
             /*
+             *  if (!session.Info.Subscription.IsValid())
+                return;
+             * 
             if (session.GetHabbo ().Achievements.ContainsKey ("ACH_VipHC")) {
                 UserAchievement clubAch = session.GetHabbo ().GetAchievementData ("ACH_VipHC");
 
@@ -216,8 +216,10 @@ private bool ProgressUserAchievement(UserInfo user, string achievementGroup, int
 
                     // Give Reward Points
                     user.Wallet.AchievementPoints += userAchievement.Level.RewardPoints;
-                    user.Wallet.Duckets += userAchievement.Level.RewardPixels;
+                    user.Wallet.AddActivityPoints(userAchievement.Level.RewardActivityPointsType,
+                        userAchievement.Level.RewardActivityPoints);
 
+                    // TODO Don't really like this implementation
                     user.Badges.RemoveBadge(userAchievement.Achievement.GroupName + (userAchievement.Level.Level - 1));
 
                     // Give new Badge
@@ -230,7 +232,7 @@ private bool ProgressUserAchievement(UserInfo user, string achievementGroup, int
                         // Send Unlocked Composer
                         session.Router.GetComposer<UnlockAchievementMessageComposer>().Compose(session,
                             achievement, userAchievement.Level.Level,
-                            userAchievement.Level.RewardPoints, userAchievement.Level.RewardPixels);
+                            userAchievement.Level.RewardPoints, userAchievement.Level.RewardActivityPoints);
 
                         // Send Score Composer
                         session.Router.GetComposer<AchievementPointsMessageComposer>()

Yupi.Controller/CatalogController.cs

@@ -58,75 +58,72 @@ public CatalogController()
 
         public CatalogOffer GetById(int pageId, int itemId)
         {
-            return ItemRepository.FindBy(x => x.Id == itemId && x.PageId.Id == pageId);
+            return ItemRepository.FindBy(x => x.Id == itemId && x.Page.Id == pageId);
         }
 
         // TODO Make extraData optional
-        public bool Purchase(Habbo user, CatalogOffer catalogItem, string extraData, int amount)
+        public bool Purchase(Habbo user, CatalogOffer offer, string extraData, int amount)
         {
-            if (catalogItem == null)
+            if (offer == null)
             {
                 return false;
             }
 
-            if (!catalogItem.CanPurchase(user.Info.Wallet, amount))
-            {
-                // TODO Should this really only be sent when the item is Limited? (no error on other items?)
-                if (catalogItem is LimitedCatalogItem)
-                {
-                    user.Router.GetComposer<CatalogLimitedItemSoldOutMessageComposer>().Compose(user);
-                }
-                return false;
-            }
+            PurchaseStatus purchaseStatus = offer.Purchase(user.Info, amount);
 
-            // TODO Move to CanPurchase
-            if (catalogItem.ClubOnly && !user.Info.Subscription.IsValid())
+            switch (purchaseStatus)
             {
-                user.Router.GetComposer<CatalogPurchaseNotAllowedMessageComposer>().Compose(user, true);
-                return false;
+                case PurchaseStatus.Ok:
+                    DeliverOffer(user, offer, extraData);
+                    return true;
+                case PurchaseStatus.LimitedSoldOut:
+                    user.Router.GetComposer<CatalogLimitedItemSoldOutMessageComposer>().Compose(user);
+                    break;
+                case PurchaseStatus.InvalidSubscription:
+                    user.Router.GetComposer<CataloguePurchaseNotAllowed>().Compose(user, CataloguePurchaseNotAllowed.ErrorCode.Not_HC);
+                    break;
+                case PurchaseStatus.NotEnoughCredits:
+                default:
+                    user.Router.GetComposer<CatalogPurchaseErrorMessageComposer>().Compose(user, CatalogPurchaseErrorMessageComposer.ErrorCode.Generic);
+                    break;
             }
+            return false;
+        }
 
-            catalogItem.Purchase(user.Info.Wallet, amount);
-
-            ItemRepository.Save(catalogItem);
+        private void DeliverOffer(Habbo user, CatalogOffer offer, string extraData) {
+            ItemRepository.Save(offer);
 
             user.Router.GetComposer<CreditsBalanceMessageComposer>().Compose(user, user.Info.Wallet.Credits);
             user.Router.GetComposer<ActivityPointsMessageComposer>().Compose(user, user.Info.Wallet);
 
-            var items = new Dictionary<BaseItem, List<Item>>();
+            var items = new Dictionary<ItemType, ICollection<Item>>();
 
-            foreach (BaseItem baseItem in catalogItem.BaseItems.Keys)
+            foreach (CatalogProduct product in offer.Products)
             {
-                Item item = baseItem.CreateNew();
+                Item item = product.Item.CreateNew();
                 item.Owner = user.Info;
                 item.TryParseExtraData(extraData);
 
-                if (!items.ContainsKey(baseItem))
+                if (!items.ContainsKey(product.Item.Type))
                 {
-                    items.Add(baseItem, new List<Item>());
+                    items.Add(product.Item.Type, new List<Item>());
                 }
 
-                items[baseItem].Add(item);
+                items[product.Item.Type].Add(item);
 
                 user.Info.Inventory.Add(item);
             }
 
             user.Router.GetComposer<UpdateInventoryMessageComposer>().Compose(user);
-            user.Router.GetComposer<PurchaseOkComposer>().Compose(user, catalogItem, catalogItem.BaseItems);
+            user.Router.GetComposer<PurchaseOkComposer>().Compose(user, offer);
 
-            // TODO Can this be solved better?
-            foreach (var item in items)
-            {
-                user.Router.GetComposer<NewInventoryObjectMessageComposer>().Compose(user, item.Key, item.Value);
-            }
+            user.Router.GetComposer<NewInventoryObjectMessageComposer>().Compose(user, items);
 
-            if (catalogItem.Badge.Length > 0)
+            if (offer.Badge.Length > 0)
             {
-                user.Info.Badges.GiveBadge(catalogItem.Badge);
+                user.Info.Badges.GiveBadge(offer.Badge);
                 UserRepository.Save(user.Info);
             }
-
-            return true;
         }
 
         public void PurchaseGift(Habbo user, CatalogOffer catalogItem, string extraData, UserInfo receiver)
@@ -140,16 +137,10 @@ public void PurchaseGift(Habbo user, CatalogOffer catalogItem, string extraData,
             {
                 AchievementManager
                     .ProgressUserAchievement(user, "ACH_GiftGiver", 1);
-            }
-
-            throw new NotImplementedException();
 
-            /*
-             *
-             *  Yupi.GetGame()
-                                .GetAchievementManager()
-                                .ProgressUserAchievement(clientByUserId, "ACH_GiftReceiver", 1, true);
-            */
+                AchievementManager
+                    .ProgressUserAchievement(receiver, "ACH_GiftGiver", 1);
+            }
         }
 
         #endregion Methods

Yupi.Controller/SSOManager.cs

@@ -136,7 +136,7 @@ public void TryLogin(Habbo session, string ssoTicket)
                     session.Router.GetComposer<FavouriteRoomsMessageComposer>().Compose(session, user.FavoriteRooms);
 
                     session.Router.GetComposer<UserClubRightsMessageComposer>()
-                        .Compose(session, user.Subscription.IsValid(),
+                        .Compose(session, user.Subscription.GetLevel(),
                             user.Rank);
 
                     session.Router.GetComposer<EnableNotificationsMessageComposer>().Compose(session);

Yupi.Messages.Contracts/Composer/Catalog/CatalogPurchaseNotAllowedMessageComposer.cs → Yupi.Messages.Contracts/Composer/Catalog/CatalogPurchaseErrorMessageComposer.cs

@@ -26,11 +26,17 @@ namespace Yupi.Messages.Contracts
 {
     using Yupi.Protocol.Buffers;
 
-    public abstract class CatalogPurchaseNotAllowedMessageComposer : AbstractComposer<bool>
+    public abstract class CatalogPurchaseErrorMessageComposer : AbstractComposer<CatalogPurchaseErrorMessageComposer.ErrorCode>
     {
+        public enum ErrorCode
+        {
+            Generic,
+            Badge_Already_Owned
+        }
+
         #region Methods
 
-        public override void Compose(Yupi.Protocol.ISender session, bool isForbidden)
+        public override void Compose(Yupi.Protocol.ISender session, ErrorCode error)
         {
             // Do nothing by default.
         }

Yupi.Messages.Contracts/Composer/Catalog/CataloguePurchaseNotAllowed.cs

@@ -0,0 +1,42 @@
+// ---------------------------------------------------------------------------------
+// <copyright file="CataloguePurchaseNotAllowed.cs" company="https://github.com/sant0ro/Yupi">
+//   Copyright (c) 2016 Claudio Santoro, TheDoctor
+// </copyright>
+// <license>
+//   Permission is hereby granted, free of charge, to any person obtaining a copy
+//   of this software and associated documentation files (the "Software"), to deal
+//   in the Software without restriction, including without limitation the rights
+//   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//   copies of the Software, and to permit persons to whom the Software is
+//   furnished to do so, subject to the following conditions:
+//
+//   The above copyright notice and this permission notice shall be included in
+//   all copies or substantial portions of the Software.
+//
+//   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//   THE SOFTWARE.
+// </license>
+// ---------------------------------------------------------------------------------
+using System;
+
+namespace Yupi.Messages.Contracts
+{
+    public class CataloguePurchaseNotAllowed : AbstractComposer<CataloguePurchaseNotAllowed.ErrorCode>
+    {
+        public enum ErrorCode {
+            Unknown,
+            Not_HC
+        }
+
+        public override void Compose(Yupi.Protocol.ISender session, ErrorCode value)
+        {
+
+        }
+    }
+}
+

Yupi.Messages.Contracts/Composer/Catalog/PurchaseOkComposer.cs

@@ -29,13 +29,11 @@ namespace Yupi.Messages.Contracts
 
     using Yupi.Model.Domain;
 
-    public abstract class PurchaseOkComposer : AbstractComposer<CatalogOffer, IDictionary<BaseItem, int>, int>
+    public abstract class PurchaseOkComposer : AbstractComposer<CatalogOffer>
     {
         #region Methods
 
-        public override void Compose(Yupi.Protocol.ISender session, CatalogOffer itemCatalog,
-            IDictionary<BaseItem, int> items,
-            int clubLevel = 1)
+        public override void Compose(Yupi.Protocol.ISender session, CatalogOffer offer)
         {
             // Do nothing by default.
         }

Yupi.Messages.Contracts/Composer/Items/NewInventoryObjectMessageComposer.cs

@@ -29,16 +29,11 @@ namespace Yupi.Messages.Contracts
     using Yupi.Model.Domain;
     using Yupi.Protocol.Buffers;
 
-    public abstract class NewInventoryObjectMessageComposer : AbstractComposer<BaseItem, List<Item>>
+    public abstract class NewInventoryObjectMessageComposer : AbstractComposer<IDictionary<ItemType, ICollection<Item>>>
     {
         #region Methods
 
-        public virtual void Compose(Yupi.Protocol.ISender session, int itemId)
-        {
-            // TODO Remove?
-        }
-
-        public override void Compose(Yupi.Protocol.ISender session, BaseItem item, List<Item> list)
+        public override void Compose(Yupi.Protocol.ISender session, IDictionary<ItemType, ICollection<Item>> itemTypes)
         {
             // Do nothing by default.
         }

Yupi.Messages.Contracts/Composer/User/UserClubRightsMessageComposer.cs

@@ -22,15 +22,18 @@
 //   THE SOFTWARE.
 // </license>
 // ---------------------------------------------------------------------------------
+using Yupi.Model.Domain;
+
+
 namespace Yupi.Messages.Contracts
 {
     using Yupi.Protocol.Buffers;
 
-    public abstract class UserClubRightsMessageComposer : AbstractComposer<bool, int, bool>
+    public abstract class UserClubRightsMessageComposer : AbstractComposer<ClubLevel, int, bool>
     {
         #region Methods
 
-        public override void Compose(Yupi.Protocol.ISender session, bool hasVIP, int rank, bool isAmbadassor = false)
+        public override void Compose(Yupi.Protocol.ISender session, ClubLevel clubLevel, int rank, bool isAmbadassor = false)
         {
             // Do nothing by default.
         }

Yupi.Messages.Contracts/Yupi.Messages.Contracts.csproj

@@ -62,7 +62,6 @@
     <Compile Include="Composer\Camera\CameraStorageUrlMessageComposer.cs" />
     <Compile Include="Composer\Catalog\CatalogOfferMessageComposer.cs" />
     <Compile Include="Composer\Catalog\CatalogPromotionGetCategoriesMessageComposer.cs" />
-    <Compile Include="Composer\Catalog\CatalogPurchaseNotAllowedMessageComposer.cs" />
     <Compile Include="Composer\Catalog\CatalogueClubPageMessageComposer.cs" />
     <Compile Include="Composer\Catalog\CatalogueIndexMessageComposer.cs" />
     <Compile Include="Composer\Catalog\CatalogueOfferConfigMessageComposer.cs" />
@@ -317,6 +316,8 @@
     <Compile Include="Composer\Chat\ShoutMessageComposer.cs" />
     <Compile Include="Composer\Chat\WhisperMessageComposer.cs" />
     <Compile Include="Composer\User\NewbieStatusMessageComposer.cs" />
+    <Compile Include="Composer\Catalog\CatalogPurchaseErrorMessageComposer.cs" />
+    <Compile Include="Composer\Catalog\CataloguePurchaseNotAllowed.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

Yupi.Messages/Composer/Achievements/AchievementProgressMessageComposer.cs

@@ -43,7 +43,7 @@ public override void Compose(Yupi.Protocol.ISender session, UserAchievement user
                 message.AppendString(userAchievement.Achievement.GroupName + userAchievement.Level.Level);
                 message.AppendInteger(userAchievement.Level.Requirement);
                 message.AppendInteger(userAchievement.Level.Requirement);
-                message.AppendInteger(userAchievement.Level.RewardPixels);
+                message.AppendInteger(userAchievement.Level.RewardActivityPoints);
                 message.AppendInteger(0);
                 message.AppendInteger(userAchievement.Progress);
                 message.AppendBool(userAchievement.Level.Level >= userAchievement.Achievement.GetMaxLevel());