don't even remember what I changed
but there's a lot of stuff, like fishing images instead of just text, and mining levels
This commit is contained in:
Lan
@@ -30,8 +30,9 @@ namespace Kehyeedra3.Services.Models
|
||||
public FishSpecies Id;
|
||||
//public byte Ego;
|
||||
//public byte Superego;
|
||||
public string Name;
|
||||
public string Emote;
|
||||
public string Name = "Missing Name";
|
||||
public string Emote = "<:missingLeg:682586847830081551>";
|
||||
public string Texture = "missingtexture.png";
|
||||
public FishRarity Rarity;
|
||||
public FishTier Tier;
|
||||
}
|
||||
@@ -40,6 +41,7 @@ namespace Kehyeedra3.Services.Models
|
||||
public ulong Id { get; set; } = 0; // this is userid incase you get alzheimers you stupid baby waa waa
|
||||
public ulong LastFish { get; set; } = 0;
|
||||
public ulong Xp { get; set; } = 50;
|
||||
public ulong FXp { get; set; } = 0;
|
||||
public ulong TXp { get; set; } = 0;
|
||||
public ulong Lvl { get; set; } = 0;
|
||||
public byte RodOwned { get; set; } = 0;
|
||||
@@ -70,8 +72,9 @@ namespace Kehyeedra3.Services.Models
|
||||
new Fish()
|
||||
{
|
||||
Id = FishSpecies.Wakasagihime,
|
||||
Name = "Touhoufish",
|
||||
Name = "Freshwater Lady",
|
||||
Emote = "<:wakasagihime:793084118949691433>",
|
||||
Texture = "touhoufish.png",
|
||||
Rarity = FishRarity.Unreasonable,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -80,6 +83,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.LuckyCatfish,
|
||||
Name = "Lucky Catfish",
|
||||
Emote = "<a:catfishleft:682655661422542888><a:catfishright:682655661481525284>",
|
||||
Texture = "catfish.gif",
|
||||
Rarity = FishRarity.Legendary,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -88,6 +92,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Doomfish,
|
||||
Name = "Doomfish",
|
||||
Emote = "<a:doomfish:704407234574155834>",
|
||||
Texture = "doomfish.gif",
|
||||
Rarity = FishRarity.Rare,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -96,6 +101,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Clownfish,
|
||||
Name = "Clownfish",
|
||||
Emote = "<a:clownfishleft:715846565972934718><a:clownfishright:715846565704761424>",
|
||||
Texture = "clownfish.gif",
|
||||
Rarity = FishRarity.Rare,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -104,6 +110,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Teracrab,
|
||||
Name = "Teracrab",
|
||||
Emote = "<a:teracrableft:710925664089538691><a:teracrabright:710925663439421512>",
|
||||
Texture = "teracrab.gif",
|
||||
Rarity = FishRarity.Rare,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -112,6 +119,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Blobfish,
|
||||
Name = "Blobfish",
|
||||
Emote = "<a:blobfishleft:704386995996065885><a:blobfishright:704386996369358888>",
|
||||
Texture = "blobfish.gif",
|
||||
Rarity = FishRarity.Rare,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -120,6 +128,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Psychedelica,
|
||||
Name = "Psychedelica",
|
||||
Emote = "<a:psychedelicaleft:704406253966721135><a:psychedelicaright:704406252125421698>",
|
||||
Texture = "psychedelica.gif",
|
||||
Rarity = FishRarity.Rare,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -128,6 +137,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Gigacrab,
|
||||
Name = "Gigacrab",
|
||||
Emote = "<:gigacrableft:715626112327221348><:gigacrabright:715626112537067580>",
|
||||
Texture = "gigacrab.png",
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -136,6 +146,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Dopefish,
|
||||
Name = "Dopefish",
|
||||
Emote = "<:dopefishleft:700422139672658009><:dopefishright:700422139643428895>",
|
||||
Texture = "dopefish.png",
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -144,6 +155,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Stargazer,
|
||||
Name = "Stargazer",
|
||||
Emote = "<:stargazerleft:700414644774240286><:stargazerright:700413063442202684>",
|
||||
Texture = "stargazer.png",
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -152,6 +164,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Isopod,
|
||||
Name = "Isopod",
|
||||
Emote = "<:isopodleft:700397032271249428><:isopodright:700397031922991206>",
|
||||
Texture = "isopod.png",
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -160,6 +173,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Sheephead,
|
||||
Name = "Sheephead",
|
||||
Emote = "<:sheepheadleft:710894977944649728><:sheepheadright:710894979467444284>",
|
||||
Texture = "sheephead.png",
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -168,6 +182,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Cod,
|
||||
Name = "Cod",
|
||||
Emote = "<:codleft:695304941715062887><:codright:695304941949943808>",
|
||||
Texture = "cod.png",
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -176,6 +191,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Salmon,
|
||||
Name = "Salmon",
|
||||
Emote = "<:salmonleft:698167269359878236><:salmonright:698167269167202324>",
|
||||
Texture = "salmon.png",
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -184,6 +200,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Shrimp,
|
||||
Name = "Shrimp",
|
||||
Emote = "<:shrimpleft:715074288788570112><:shrimpright:715074288863936552>",
|
||||
Texture = "shrimp.png",
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -192,6 +209,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Crayfish,
|
||||
Name = "Crayfish",
|
||||
Emote = "<:crayfishleft:715638929885495377><:crayfishright:715638929843421284>",
|
||||
Texture = "crayfish.png",
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -200,6 +218,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Betta,
|
||||
Name = "Betta",
|
||||
Emote = "<:bettaleft:698179217107714088><:bettaright:698179216868638851>",
|
||||
Texture = "betta.png",
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -208,6 +227,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Pufferfish,
|
||||
Name = "Pufferfish",
|
||||
Emote = "<:pufferfishleft:715075414179184691><:pufferfishright:715075414116007937>",
|
||||
Texture = "pufferfish.png",
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -216,6 +236,7 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Carp,
|
||||
Name = "Carp",
|
||||
Emote = "<:koicarpleft:698204388556275752><:koicarpright:698204386421374986>",
|
||||
Texture = "carp.png",
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
@@ -224,15 +245,17 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Megacrab,
|
||||
Name = "Hermit Crab",
|
||||
Emote = "<:hermitcrableft:715071501996392519><:hermitcrabright:715071501971488808>",
|
||||
Texture = "hermitcrab.png",
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T1
|
||||
},
|
||||
|
||||
new Fish() //// Tier 2
|
||||
{
|
||||
Id = FishSpecies.Hypnofish,
|
||||
Id = FishSpecies.Hypnofish, // replace with shrimp waifu fish when art done
|
||||
Name = "Hypnofish",
|
||||
Emote = "<:paska:786244602440450109><:hypnoosi:786244623478947841>",
|
||||
Texture = "hypnofish.png",
|
||||
Rarity = FishRarity.Legendary,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
@@ -240,7 +263,7 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.Swolefish,
|
||||
Name = "Pumped Up Swolefish",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
//Texture = "",
|
||||
Rarity = FishRarity.Rare,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
@@ -248,7 +271,7 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.Dogfish,
|
||||
Name = "Dogfish",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Rare,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
@@ -257,6 +280,23 @@ namespace Kehyeedra3.Services.Models
|
||||
Id = FishSpecies.Gunfish,
|
||||
Name = "Gunfish",
|
||||
Emote = "<:gunfishleft:793492588799590460><:gunfishright:793492625277714442>",
|
||||
Texture = "gunfish.png",
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
new Fish()
|
||||
{
|
||||
Id = FishSpecies.Dingus,
|
||||
Name = "Dingus",
|
||||
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
new Fish()
|
||||
{
|
||||
Id = FishSpecies.Finnfish,
|
||||
Name = "Fi'ish",
|
||||
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
@@ -264,7 +304,7 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.Rockfish,
|
||||
Name = "Rockfish",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
@@ -272,16 +312,32 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.Fishlet,
|
||||
Name = "Fishlet",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
new Fish()
|
||||
{
|
||||
Id = FishSpecies.Cavefish,
|
||||
Name = "Cavefish",
|
||||
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
new Fish()
|
||||
{
|
||||
Id = FishSpecies.Neck,
|
||||
Name = "Neck",
|
||||
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T2
|
||||
},
|
||||
|
||||
new Fish() //// Tier 3
|
||||
{
|
||||
Id = FishSpecies.SpecDoomfish,
|
||||
Name = "Spectral Doomfish",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
Id = FishSpecies.Circlefish,
|
||||
Name = "Circle Fish",
|
||||
|
||||
Rarity = FishRarity.Legendary,
|
||||
Tier = FishTier.T3
|
||||
},
|
||||
@@ -289,7 +345,7 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.RevCrab,
|
||||
Name = "Revenant Crab",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Rare,
|
||||
Tier = FishTier.T3
|
||||
},
|
||||
@@ -297,7 +353,7 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.SpecFlameworm,
|
||||
Name = "Spectral Flameworm",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T3
|
||||
},
|
||||
@@ -305,7 +361,15 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.SpecShrimp,
|
||||
Name = "Spectral Shrimp",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T3
|
||||
},
|
||||
new Fish()
|
||||
{
|
||||
Id = FishSpecies.Ghostie,
|
||||
Name = "Ghostie",
|
||||
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T3
|
||||
},
|
||||
@@ -315,7 +379,7 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.T4PH1,
|
||||
Name = "Placeholder",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Legendary,
|
||||
Tier = FishTier.T4
|
||||
},
|
||||
@@ -323,7 +387,7 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.T4PH2,
|
||||
Name = "Placeholder",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Rare,
|
||||
Tier = FishTier.T4
|
||||
},
|
||||
@@ -331,7 +395,7 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.T4PH3,
|
||||
Name = "Placeholder",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Uncommon,
|
||||
Tier = FishTier.T4
|
||||
},
|
||||
@@ -339,7 +403,7 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = FishSpecies.T4PH4,
|
||||
Name = "Placeholder",
|
||||
Emote = "<:missingLeg:682586847830081551>",
|
||||
|
||||
Rarity = FishRarity.Common,
|
||||
Tier = FishTier.T4
|
||||
},
|
||||
@@ -379,26 +443,34 @@ namespace Kehyeedra3.Services.Models
|
||||
Hypnofish = 20,
|
||||
//T2 Rare
|
||||
Swolefish = 21,
|
||||
Dogfish = 102,
|
||||
Dogfish = 22,
|
||||
//T2 Uncommon
|
||||
Gunfish = 22,
|
||||
Gunfish = 30,
|
||||
Dingus = 31,
|
||||
Finnfish = 32,
|
||||
//T2 Common
|
||||
Rockfish = 23,
|
||||
Fishlet = 24,
|
||||
Rockfish = 40,
|
||||
Fishlet = 41,
|
||||
Cavefish = 42,
|
||||
Neck = 43,
|
||||
|
||||
//T3 Legendary
|
||||
SpecDoomfish = 25,
|
||||
Circlefish = 50,
|
||||
//T3 Rare
|
||||
RevCrab = 26,
|
||||
RevCrab = 51,
|
||||
//T3 Uncommon
|
||||
SpecFlameworm = 27,
|
||||
SpecFlameworm = 60,
|
||||
//T3 Common
|
||||
SpecShrimp = 28,
|
||||
SpecShrimp = 70,
|
||||
Ghostie = 71,
|
||||
//T4
|
||||
T4PH1 = 29,
|
||||
T4PH2 = 30,
|
||||
T4PH3 = 31,
|
||||
T4PH4 = 32,
|
||||
T4PH1 = 80,
|
||||
//r
|
||||
T4PH2 = 90,
|
||||
//uc
|
||||
T4PH3 = 100,
|
||||
//c
|
||||
T4PH4 = 110,
|
||||
}
|
||||
public class FishingInventorySlot
|
||||
{
|
||||
|
||||
19
Kehyeedra3/Services/Models/Mining.cs
Normal file
19
Kehyeedra3/Services/Models/Mining.cs
Normal file
@@ -0,0 +1,19 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
public class Mining
|
||||
{
|
||||
[Key]
|
||||
public ulong Id { get; set; } = 0;
|
||||
public ulong Xp { get; set; } = 50;
|
||||
public ulong TXp { get; set; } = 0;
|
||||
public ulong Lvl { get; set; } = 0;
|
||||
public ulong LastMine { get; set; } = 0;
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,6 @@ namespace Kehyeedra3.Services.Models
|
||||
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; } = "{}";
|
||||
[Column(TypeName = "TINYINT")]
|
||||
@@ -62,25 +61,25 @@ namespace Kehyeedra3.Services.Models
|
||||
{
|
||||
Id = Items.Lettuce,
|
||||
Name = "Learning Lettuce",
|
||||
Price = 50
|
||||
Price = 25
|
||||
},
|
||||
new Item()
|
||||
{
|
||||
Id = Items.RareBait,
|
||||
Name = "Rare Bait",
|
||||
Price = 50
|
||||
Price = 25
|
||||
},
|
||||
new Item()
|
||||
{
|
||||
Id = Items.BigBait,
|
||||
Name = "Big Bait",
|
||||
Price = 20
|
||||
Price = 10
|
||||
},
|
||||
new Item()
|
||||
{
|
||||
Id = Items.SpecialBait,
|
||||
Name = "Master Bait",
|
||||
Price = 100
|
||||
Price = 50
|
||||
},
|
||||
new Item()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user