lan/Kehyeedra
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

general store update

Browse Source 
also some updated fish emoji
This commit is contained in:
Lan
2020-05-30 12:29:20 +03:00
parent 95d3b05eb3
commit 43966cb6cb
6 changed files with 519 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Kehyeedra3/Services/Models/Fishing.cs
View File

@@ -76,14 +76,14 @@ namespace Kehyeedra3.Services.Models
{
Id = FishSpecies.Clownfish,
Name = "Clownfish",
Emote = "<a:clownfishleft:704404973441515661><:clownfishright:704404973076611123>",
Emote = "<a:clownfishleft:715846565972934718><a:clownfishright:715846565704761424>",
Rarity = FishRarity.Rare
},
new Fish()
{
Id = FishSpecies.Teracrab,
Name = "Teracrab",
Emote = "<a:teracrableft:681872487901954123><a:teracrabright:681872487264681984>",
Emote = "<a:teracrableft:710925664089538691><a:teracrabright:710925663439421512>",
Rarity = FishRarity.Rare
},
new Fish()
@@ -104,7 +104,7 @@ namespace Kehyeedra3.Services.Models
{
Id = FishSpecies.Gigacrab,
Name = "Gigacrab",
Emote = "<:gigacrab:681871426382594208>",
Emote = "<:gigacrableft:715626112327221348><:gigacrabright:715626112537067580>",
Rarity = FishRarity.Uncommon
},
new Fish()
@@ -132,7 +132,7 @@ namespace Kehyeedra3.Services.Models
{
Id = FishSpecies.Sheephead,
Name = "Sheephead",
Emote = "<:sheepheadleft:704406846584127581><:sheepheadright:704406846831722606>",
Emote = "<:sheepheadleft:710894977944649728><:sheepheadright:710894979467444284>",
Rarity = FishRarity.Uncommon
},
new Fish()
@@ -153,14 +153,14 @@ namespace Kehyeedra3.Services.Models
{
Id = FishSpecies.Shrimp,
Name = "Shrimp",
Emote = "<:shromp:695335369004023859>",
Emote = "<:shrimpleft:715074288788570112><:shrimpright:715074288863936552>",
Rarity = FishRarity.Common
},
new Fish()
{
Id = FishSpecies.Crayfish,
Name = "Crayfish",
Emote = "<:crayfishleft:698157988195598466><:crayfishright:698157988170432602>",
Emote = "<:crayfishleft:715638929885495377><:crayfishright:715638929843421284>",
Rarity = FishRarity.Common
},
new Fish()
@@ -174,7 +174,7 @@ namespace Kehyeedra3.Services.Models
{
Id = FishSpecies.Pufferfish,
Name = "Pufferfish",
Emote = "<:pufferfish:698203043350708225>",
Emote = "<:pufferfishleft:715075414179184691><:pufferfishright:715075414116007937>",
Rarity = FishRarity.Common
},
new Fish()
@@ -187,8 +187,8 @@ namespace Kehyeedra3.Services.Models
new Fish()
{
Id = FishSpecies.Megacrab,
Name = "Megacrab",
Emote = "<:megacrab:681871426319286302>",
Name = "Hermit Crab",
Emote = "<:hermitcrableft:715071501996392519><:hermitcrabright:715071501971488808>",
Rarity = FishRarity.Common
},

42
Kehyeedra3/Services/Models/User.cs
View File

@@ -30,27 +30,43 @@ namespace Kehyeedra3.Services.Models
return false;
}
public void SetGenInv(List<Item> newInv)
//public void SetGenInv(List<Item> newInv)
//{
// GeneralInventory = JsonConvert.SerializeObject(newInv);
//}
//public List<Item> GetGenInv()
//{
// if (string.IsNullOrEmpty(GeneralInventory))
// {
// return new List<Item>();
// }
// return JsonConvert.DeserializeObject<List<Item>>(GeneralInventory);
//}
public Dictionary<Items, int[]> GetGenInve()
{
GeneralInventory = JsonConvert.SerializeObject(newInv);
return JsonConvert.DeserializeObject<Dictionary<Items, int[]>>(GeneralInventory);
}
public List<Item> GetGenInv()
public void SetGenInve(Dictionary<Items, int[]> inv)
{
return JsonConvert.DeserializeObject<List<Item>>(GeneralInventory);
Dictionary<int, int[]> temp = new Dictionary<int, int[]>();
foreach (var entry in inv)
{
temp.Add((int)entry.Key, entry.Value);
}
GeneralInventory = JsonConvert.SerializeObject(temp);
}
public static List<Item> ListItems()
{
return new List<Item>
{
new Item()
{
Id = Items.Item1,
Name = "Item1"
},
new Item()
{
Id = Items.Item2,
Name = "Item1"
Id = Items.DirtyBoot,
Name = "Lan's Love",
Price = 100
},
};
}
@@ -58,6 +74,7 @@ namespace Kehyeedra3.Services.Models
{
public Items Id { get; set; }
public string Name { get; set; }
public int Price { get; set; }
}
public class BattleFishObject
{
@@ -72,8 +89,7 @@ namespace Kehyeedra3.Services.Models
}
public enum Items
{
Item1 = 0,
Item2 = 1,
DirtyBoot = 0,
}
public class ItemSlot
{