A bunch of stuff

Battlefish stuff, economy stuff, fixes, additions, everything else that I didn't remember to mention

Kehyeedra3/Services/Models/Fishing.cs

@@ -75,7 +75,7 @@ namespace Kehyeedra3.Services.Models
                 {
                     Id = FishSpecies.Clownfish,
                     Name = "Clownfish",
-                    Emote = "<:missingRar:682586847100403715>[Clownfish]",
+                    Emote = "<a:clownfishleft:704404973441515661><:clownfishright:704404973076611123>",
                     Rarity = FishRarity.Rare
                 },
                 new Fish()
@@ -89,14 +89,14 @@ namespace Kehyeedra3.Services.Models
                 {
                     Id = FishSpecies.Blobfish,
                     Name = "Blobfish",
-                    Emote = "<:missingRar:682586847100403715>[Blobfish]",
+                    Emote = "<a:blobfishleft:704386995996065885><a:blobfishright:704386996369358888>",
                     Rarity = FishRarity.Rare
                 },
                 new Fish()
                 {
                     Id = FishSpecies.Psychedelica,
                     Name = "Psychedelica",
-                    Emote = "<a:psychedelicaleft:682606276592664666><a:psychedelicaright:682606278354141249>",
+                    Emote = "<a:psychedelicaleft:704406253966721135><a:psychedelicaright:704406252125421698>",
                     Rarity = FishRarity.Rare
                 },
                 new Fish()
@@ -131,7 +131,7 @@ namespace Kehyeedra3.Services.Models
                 {
                     Id = FishSpecies.Sheephead,
                     Name = "Sheephead",
-                    Emote = "<:sheepheadleft:681200891810021376><:sheepheadright:681200891608563767>",
+                    Emote = "<:sheepheadleft:704406846584127581><:sheepheadright:704406846831722606>",
                     Rarity = FishRarity.Uncommon
                 },
                 new Fish()

Kehyeedra3/Services/Models/Store.cs

@@ -18,7 +18,8 @@ namespace Kehyeedra3.Services.Models
     public enum StoreItemType
     {
         Fish = 0,
-        Reminders = 1
+        Items = 1,
+        Reminders = 2
     }
 
     public class StoreInventory

Kehyeedra3/Services/Models/User.cs

@@ -1,12 +1,22 @@
-namespace Kehyeedra3.Services.Models
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace Kehyeedra3.Services.Models
 {
     public class User
     {
+        [Key]
         public ulong Id { get; set; } = 0;
         public string Avatar { get; set; } = null;
         public string Username { get; set; } = null;
         public long Money { get; set; } = 0;
         public ulong LastMine { get; set; } = 0;
+        [Column(TypeName = "LONGTEXT")]
+        public string GeneralInventory { get; set; } = "{}";
+        public ICollection<BattleFishObject> BattleFish { get; set; }
+
 
         public bool GrantMoney(User bank, long amount)
         {
@@ -19,5 +29,55 @@
 
             return false;
         }
+
+        public void SetGenInv(List<Item> newInv)
+        {
+            GeneralInventory = JsonConvert.SerializeObject(newInv);
+        }
+        public List<Item> GetGenInv()
+        {
+            return JsonConvert.DeserializeObject<List<Item>>(GeneralInventory);
+        }
+        public static List<Item> ListItems()
+        {
+            return new List<Item>
+            {
+                new Item()
+                {
+                    Id = Items.Item1,
+                    Name = "Item1"
+                },
+                new Item()
+                {
+                    Id = Items.Item2,
+                    Name = "Item1"
+                },
+            };
+        }
+        public class Item
+        {
+            public Items Id { get; set; }
+            public string Name { get; set; }
+        }
+        public class BattleFishObject
+        {
+            [Key]
+            public ulong FishId { get; set; }
+            public byte FishType { get; set; } = 0;
+            public ulong Xp { get; set; } = 0;
+            public ulong NextXp { get; set; } = 50;
+            public int Lvl { get; set; } = 0;
+            public string Name { get; set; } = "Unnamed";
+        }
+    }
+    public enum Items
+    {
+        Item1 = 0,
+        Item2 = 1,
+    }
+    public class ItemSlot
+    {
+        public int Id;
+        public int Amount;
     }
 }