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

fish update

Browse Source 
thank you zeus very cool
This commit is contained in:
Lan
2020-02-29 00:42:27 +02:00
parent c623734a72
commit 4a50857cc3
3 changed files with 355 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,25 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace Kehyeedra3.Services.Models
{
public enum FishSize
{
Small = 0,
Medium = 1,
Large = 2
}
public enum FishRarity
{
Common, Uncommon, Rare, Legendary
}
public class Fish
{
public FishSpecies Id;
//public byte Ego;
//public byte Superego;
public string Name;
public string Emote;
public FishRarity Rarity;
}
public class Fishing
{
public ulong Id { get; set; } = 0; // this is userid incase you get alzheimers you stupid baby waa waa
@@ -13,30 +32,175 @@ namespace Kehyeedra3.Services.Models
public ulong Lvl { get; set; } = 0;
[Column(TypeName="LONGTEXT")]
public string Inventory { get; set; } = "[]";
public string Inventory { get; set; } = "{}";
public List<FishingInventorySlot> GetInventory()
public Dictionary<FishSpecies, int[]> GetInventory()
{
return JsonConvert.DeserializeObject<List<FishingInventorySlot>>(Inventory);
return JsonConvert.DeserializeObject<Dictionary<FishSpecies, int[]>>(Inventory);
}
public void SetInventory(List<FishingInventorySlot> inv)
public void SetInventory(Dictionary<FishSpecies, int[]> inv)
{
Inventory = JsonConvert.SerializeObject(inv);
Dictionary<int, int[]> temp = new Dictionary<int, int[]>();
foreach(var entry in inv){
temp.Add((int)entry.Key, entry.Value);
}
Inventory = JsonConvert.SerializeObject(temp);
}
public static List<Fish> GetFishList()
{
return new List<Fish>
{
new Fish()
{
Id = FishSpecies.LuckyCatfish,
Name = "Lucky Catfish",
Emote = "<a:catfishleft:682655661422542888><a:catfishright:682655661481525284>",
Rarity = FishRarity.Legendary
},
new Fish()
{
Id = FishSpecies.Doomfish,
Name = "Doomfish",
Emote = "<:doomfish:651879988232060949>",
Rarity = FishRarity.Rare
},
new Fish()
{
Id = FishSpecies.Clownfish,
Name = "Clownfish",
Emote = "<:missingRar:682586847100403715>[Clownfish]",
Rarity = FishRarity.Rare
},
new Fish()
{
Id = FishSpecies.Teracrab,
Name = "Teracrab",
Emote = "<a:teracrableft:681872487901954123><a:teracrabright:681872487264681984>",
Rarity = FishRarity.Rare
},
new Fish()
{
Id = FishSpecies.Blobfish,
Name = "Blobfish",
Emote = "<:missingRar:682586847100403715>[Blobfish]",
Rarity = FishRarity.Rare
},
new Fish()
{
Id = FishSpecies.Psychedelica,
Name = "Psychedelica",
Emote = "<a:psychedelicaleft:682606276592664666><a:psychedelicaright:682606278354141249>",
Rarity = FishRarity.Rare
},
new Fish()
{
Id = FishSpecies.Gigacrab,
Name = "Gigacrab",
Emote = "<:gigacrab:681871426382594208>",
Rarity = FishRarity.Uncommon
},
new Fish()
{
Id = FishSpecies.Dopefish,
Name = "Dopefish",
Emote = "<:missingUnc:682586846857003064>[Dopefish]",
Rarity = FishRarity.Uncommon
},
new Fish()
{
Id = FishSpecies.Stargazer,
Name = "Stargazer",
Emote = "<:missingUnc:682586846857003064>[Stargazer]",
Rarity = FishRarity.Uncommon
},
new Fish()
{
Id = FishSpecies.Isopod,
Name = "Isopod",
Emote = "<:missingUnc:682586846857003064>[Isopod]",
Rarity = FishRarity.Uncommon
},
new Fish()
{
Id = FishSpecies.Sheephead,
Name = "Sheephead",
Emote = "<:sheepheadleft:681200891810021376><:sheepheadright:681200891608563767>",
Rarity = FishRarity.Uncommon
},
new Fish()
{
Id = FishSpecies.Cod,
Name = "Cod",
Emote = "<:codleft:681182238448418891><:codright:681182238628511747>",
Rarity = FishRarity.Common
},
new Fish()
{
Id = FishSpecies.Salmon,
Name = "Salmon",
Emote = "<:missingCom:682586847079432217>[Salmon]",
Rarity = FishRarity.Common
},
new Fish()
{
Id = FishSpecies.Shrimp,
Name = "Shrimp",
Emote = "<:missingCom:682586847079432217>[Shrimp]",
Rarity = FishRarity.Common
},
new Fish()
{
Id = FishSpecies.Crayfish,
Name = "Crayfish",
Emote = "<:missingCom:682586847079432217>[Crayfish]",
Rarity = FishRarity.Common
},
new Fish()
{
Id = FishSpecies.Betta,
Name = "Betta",
Emote = "<:missingCom:682586847079432217>[Betta]",
Rarity = FishRarity.Common
},
new Fish()
{
Id = FishSpecies.Pufferfish,
Name = "Pufferfish",
Emote = "<:missingCom:682586847079432217>[Pufferfish]",
Rarity = FishRarity.Common
},
new Fish()
{
Id = FishSpecies.Carp,
Name = "Carp",
Emote = "<:missingCom:682586847079432217>[Carp]",
Rarity = FishRarity.Common
},
new Fish()
{
Id = FishSpecies.Megacrab,
Name = "Megacrab",
Emote = "<:megacrab:681871426319286302>",
Rarity = FishRarity.Common
}
};
}
}
public class FishObject
{
public FishSpecies Species;
public FishWeight Weight;
public FishRarity Rarity;
//public class FishObject
//{
// public FishSpecies Species;
// public FishSize Weight;
// public FishRarity Rarity;
// public override string ToString()
// {
// return $"{Weight.ToString()} {Rarity.ToString()} {Species.ToString()}";
// }
//}
public override string ToString()
{
return $"{Weight.ToString()} {Rarity.ToString()} {Species.ToString()}";
}
}
public enum FishSpecies
{
//legendary
@@ -63,22 +227,9 @@ namespace Kehyeedra3.Services.Models
Carp = 18,
Megacrab = 19
}
public enum FishWeight
{
Small = 1,
Medium = 2,
Large = 3
}
public enum FishRarity
{
Common = 1,
Uncommon = 2,
Rare = 3,
Legendary = 4
}
public class FishingInventorySlot
{
public FishObject Fish;
public ulong Amount;
public int Id;
public int[] Amount;
}
}

10
Kehyeedra3/Services/Models/Trading.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace Kehyeedra3.Services.Models
{
public class Trading
{
public ulong Id { get; set; } = 0;
public ulong UserId { get; set; } = 0;
public ulong Price { get; set; } = 0;
}
}