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

fishing changes and stuff

Browse Source
This commit is contained in:
Lan
2021-03-31 17:18:21 +03:00
parent 2b8312c0c6
commit 5f9ebe48a4
15 changed files with 1603 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
Kehyeedra3/Services/Models/BattleFishCharacters.cs Normal file
View File

@@ -0,0 +1,85 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Kehyeedra3.Services.Models
{
public class BattleFishCharacters
{
public enum Character
{
Null = 0,
HoboShrimp = 1,
PocketSalmon = 2,
Holder2 = 3,
Holder3 = 4
}
public class BFCharacter
{
public Character Id;
public string Name;
public string Emote;
public string Intro;
public int Attack;
public int Defense;
public int BaseHealth;
public int BaseActionPoints;
public int DodgeRate;
}
public static List<BFCharacter> GetBFCharList()
{
return new List<BFCharacter>
{
new BFCharacter()
{
Id = Character.Null,
Name = "Secret Squirrel",
Emote = "<:skirel:762643322254393364>",
Intro = "He looks defeated.",
Attack = 5,
Defense = 0,
BaseHealth = 25,
BaseActionPoints = 0,
DodgeRate = 0
},
new BFCharacter()
{
Id = Character.HoboShrimp,
Name = "Hobo Shrimp",
Emote = "<:missingLeg:682586847830081551>",
Intro = "He's been a little down on his luck lately.",
Attack = 5,
Defense = 5,
BaseHealth = 5,
BaseActionPoints = 5,
DodgeRate = 5
},
new BFCharacter()
{
Id = Character.PocketSalmon,
Name = "Pocket Salmon",
Emote = "<:missingLeg:682586847830081551>",
Intro = "I pray your pockets don't have holes.",
Attack = 5,
Defense = 5,
BaseHealth = 5,
BaseActionPoints = 5,
DodgeRate = 5
}
};
}
}
}

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

@@ -15,7 +15,7 @@ namespace Kehyeedra3.Services.Models
Common, Uncommon, Rare, Legendary,
T2Rare, T2Legendary, T2Uncommon, T2Common,
T3Rare, T3Legendary, T3Uncommon, T3Common,
T4Rare, T4Legendary, T4Uncommon, T4Common
T4Rare, T4Legendary, T4Uncommon, T4Common, Unreasonable
}
public class Fish
{
@@ -58,6 +58,13 @@ namespace Kehyeedra3.Services.Models
{
return new List<Fish>
{
new Fish()
{
Id = FishSpecies.Wakasagihime,
Name = "Touhoufish",
Emote = "<:wakasagihime:793084118949691433><:emptyslot:709350723199959101>",
Rarity = FishRarity.Unreasonable
},
new Fish()
{
Id = FishSpecies.LuckyCatfish,
@@ -194,9 +201,9 @@ namespace Kehyeedra3.Services.Models
new Fish() //// Tier 2
{
Id = FishSpecies.T2Circusfish,
Name = "Circusfish",
Emote = "<:missingLeg:682586847830081551>",
Id = FishSpecies.T2Leg,
Name = "Hypnofish",
Emote = "<:paska:786244602440450109><:hypnoosi:786244623478947841>",
Rarity = FishRarity.T2Legendary
},
new Fish()
@@ -210,7 +217,7 @@ namespace Kehyeedra3.Services.Models
{
Id = FishSpecies.T2Gunfish,
Name = "Gunfish",
Emote = "<:missingLeg:682586847830081551>",
Emote = "<:gunfishleft:793492588799590460><:gunfishright:793492625277714442>",
Rarity = FishRarity.T2Uncommon
},
new Fish()
@@ -285,6 +292,8 @@ namespace Kehyeedra3.Services.Models
public enum FishSpecies
{
//unreasonable
Wakasagihime = 0,
//legendary
LuckyCatfish = 1,
//rare
@@ -309,7 +318,7 @@ namespace Kehyeedra3.Services.Models
Carp = 18,
Megacrab = 19,
//T2 Legendary
T2Circusfish = 20,
T2Leg = 20,
//T2 Rare
T2Swolefish = 21,
//T2 Uncommon

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

@@ -22,7 +22,7 @@ namespace Kehyeedra3.Services.Models
public bool GrantMoney(User bank, long amount)
{
if(bank.Money > amount)
if(bank.Money >= amount)
{
Money += amount;
bank.Money -= amount;
@@ -55,15 +55,60 @@ namespace Kehyeedra3.Services.Models
new Item()
{
Id = Items.DirtyBoot,
Name = "Lan's Love",
Name = "Love",
Price = 100
},
new Item()
{
Id = Items.Lettuce,
Name = "Lettuce",
Name = "Learning Lettuce",
Price = 50
}
},
new Item()
{
Id = Items.RareBait,
Name = "Rare Bait",
Price = 50
},
new Item()
{
Id = Items.BigBait,
Name = "Big Bait",
Price = 20
},
new Item()
{
Id = Items.SpecialBait,
Name = "Master Bait",
Price = 100
},
new Item()
{
Id = Items.RodFrame,
Name = "Incomplete Rod",
Price = 500
},
new Item()
{
Id = Items.UpgradeT2,
Name = "Lucky Paste",
Price = 1000
},
new Item()
{
Id = Items.UpgradeT3,
Name = "T2 Scraps",
Price = 2000
},
new Item()
{
Id = Items.UpgradeT4,
Name = "T3 Cream",
Price = 4000
},
};
}
public class Item
@@ -98,7 +143,16 @@ namespace Kehyeedra3.Services.Models
public enum Items
{
DirtyBoot = 0,
Lettuce = 1
Lettuce = 1,
RareBait = 2,
BigBait = 3,
SpecialBait = 4,
RodFrame = 5,
UpgradeT2 = 200,
UpgradeT3 = 201,
UpgradeT4 = 202,
}
public class ItemSlot
{

2
Kehyeedra3/Services/ReminderService.cs
View File

@@ -58,7 +58,7 @@ namespace Kehyeedra3.Services
}
catch { await (await Bot._bot.GetUser(242040333309837327).GetOrCreateDMChannelAsync()).SendMessageAsync($"Time of error ^\n" +
$"A fucky wucky has occurred, uwu\nFix wemindew sewwis dimwiwt" +
$"\nThis was the reminder: {reminder.Id} {reminder.UserId} {reminder.Send.FromYeedraStamp()}"); }
$"\nThis was the reminder: {reminder.Id} \nto: {reminder.UserId} \ntime: {reminder.Send.FromYeedraStamp()}"); }
}
public async Task Tick()