@ -522,25 +522,25 @@ namespace Kehyeedra3
if ( lastfish < time )
if ( lastfish < time )
{
{
int rari = ( SRandom . Next ( 0 , 2 0 1 ) ) ;
int rari = ( SRandom . Next ( 0 , 2 0 0 1 ) ) ;
int weight = SRandom . Next ( 1 , 1 5 1 ) ;
int weight = SRandom . Next ( 1 0 + Convert . ToInt32 ( level * 5 ) , 1 5 0 1 ) ;
ulong rarity ;
ulong rarity ;
if ( level < 1 0 0 )
if ( level < 1 0 0 )
{
{
rarity = level + ( ulong ) rari ;
rarity = level * 1 0 + ( ulong ) rari ;
}
}
else
else
{
{
rarity = 1 0 0 + ( ulong ) rari ;
rarity = 1 0 0 0 + ( ulong ) rari ;
}
}
Fish fish ;
Fish fish ;
if ( rarity = = 2 0 7 | | rarity = = 2 7 7 )
if ( rarity = = 2 0 7 0 | | rarity = = 2 7 7 0 )
{
{
rarity = Convert . ToUInt64 ( SRandom . Next ( 2 0 7 , 3 0 1 ) ) + level ;
rarity = Convert . ToUInt64 ( SRandom . Next ( 2 0 0 7 , 3 0 0 1 ) ) + level * 4 ;
if ( rarity > 2 5 0 )
if ( rarity > 2 5 0 0 )
{
{
List < Fish > possibleFishes = fishes . Where ( f = > ( int ) f . Rarity = = ( int ) FishRarity . Legendary ) . ToList ( ) ;
List < Fish > possibleFishes = fishes . Where ( f = > ( int ) f . Rarity = = ( int ) FishRarity . Legendary ) . ToList ( ) ;
fish = possibleFishes [ SRandom . Next ( possibleFishes . Count ) ] ;
fish = possibleFishes [ SRandom . Next ( possibleFishes . Count ) ] ;
@ -554,13 +554,13 @@ namespace Kehyeedra3
}
}
}
}
else if ( rarity > 1 7 0 )
else if ( rarity > 1 7 0 0 )
{
{
rarity = Convert . ToUInt64 ( SRandom . Next ( 1 8 0 , 2 8 1 ) ) ;
rarity = Convert . ToUInt64 ( SRandom . Next ( 1 7 5 0 , 2 8 0 1 ) ) ;
List < Fish > possibleFishes = fishes . Where ( f = > ( int ) f . Rarity = = ( int ) FishRarity . Uncommon ) . ToList ( ) ;
List < Fish > possibleFishes = fishes . Where ( f = > ( int ) f . Rarity = = ( int ) FishRarity . Uncommon ) . ToList ( ) ;
fish = possibleFishes [ SRandom . Next ( possibleFishes . Count ) ] ;
fish = possibleFishes [ SRandom . Next ( possibleFishes . Count ) ] ;
xp = 1 0 ;
xp = 1 0 ;
if ( rarity > 2 6 0 )
if ( rarity > 2 6 0 0 )
{
{
possibleFishes = fishes . Where ( f = > ( int ) f . Rarity = = ( int ) FishRarity . Rare ) . ToList ( ) ;
possibleFishes = fishes . Where ( f = > ( int ) f . Rarity = = ( int ) FishRarity . Rare ) . ToList ( ) ;
fish = possibleFishes [ SRandom . Next ( possibleFishes . Count ) ] ;
fish = possibleFishes [ SRandom . Next ( possibleFishes . Count ) ] ;
@ -578,26 +578,26 @@ namespace Kehyeedra3
if ( fish . Rarity = = FishRarity . Legendary )
if ( fish . Rarity = = FishRarity . Legendary )
{
{
weight = 1 0 0 ;
weight = 1 0 0 0 ;
}
}
if ( weight > = 7 5 )
if ( weight > = 7 5 0 )
{
{
size = FishSize . Medium ;
size = FishSize . Medium ;
if ( weight > = ( 1 0 0 - Convert . ToInt32 ( level ) ) )
if ( weight > = ( 1 0 0 0 - Convert . ToInt32 ( level * 2 ) ) )
{
{
weight = SRandom . Next ( 1 , 2 0 1 ) ;
weight = SRandom . Next ( 1 0 , 2 0 0 1 ) + Convert . ToInt32 ( level * 5 ) ;
}
}
if ( fish . Rarity = = FishRarity . Legendary )
if ( fish . Rarity = = FishRarity . Legendary )
{
{
weight = SRandom . Next ( 2 0 0 + Convert . ToInt32 ( level * 2 ) , 4 0 0 1 ) ;
weight = SRandom . Next ( 2 0 0 0 + Convert . ToInt32 ( level * 2 0 ) , 4 0 0 0 1 ) ;
}
}
if ( weight > 5 0 )
if ( weight > 5 0 0 )
{
{
double w = Convert . ToDouble ( weight ) ;
double w = Convert . ToDouble ( weight ) ;
xp + = Convert . ToUInt64 ( Math . Round ( ( xp * w / 1 0 0 ) , 0 , MidpointRounding . ToEven ) ) ;
xp = Convert . ToUInt64 ( Math . Round ( ( xp * w / 1 0 0 0 ) , 0 , MidpointRounding . ToEven ) ) ;
}
}
}
}
else
else
@ -605,7 +605,7 @@ namespace Kehyeedra3
size = FishSize . Small ;
size = FishSize . Small ;
}
}
if ( weight > = 1 5 0 )
if ( weight > = 1 5 0 0 )
{
{
size = FishSize . Large ;
size = FishSize . Large ;
}
}
@ -619,7 +619,7 @@ namespace Kehyeedra3
await Database . SaveChangesAsync ( ) . ConfigureAwait ( false ) ;
await Database . SaveChangesAsync ( ) . ConfigureAwait ( false ) ;
}
}
if ( rarity > 2 0 )
if ( rarity > 2 0 0 )
{
{
ulong toNextLvl = 0 ;
ulong toNextLvl = 0 ;
using ( var Database = new ApplicationDbContextFactory ( ) . CreateDbContext ( ) )
using ( var Database = new ApplicationDbContextFactory ( ) . CreateDbContext ( ) )
@ -667,7 +667,7 @@ namespace Kehyeedra3
await Database . SaveChangesAsync ( ) . ConfigureAwait ( false ) ; // :]
await Database . SaveChangesAsync ( ) . ConfigureAwait ( false ) ; // :]
}
}
await Context . Channel . SendMessageAsync ( $"{Context.User.Mention}\n {fish.Emote} You have caught a {weight / 10d}kg **{fish.Name}**, rarity: {fish.Rarity}\nYou gain **{xp}**xp.\n{lvlUp}" ) ;
await Context . Channel . SendMessageAsync ( $"{Context.User.Mention}\n {fish.Emote} You have caught a {weight / 100 d}kg **{fish.Name}**, rarity: {fish.Rarity}\nYou gain **{xp}**xp.\n{lvlUp}" ) ;
}
}
else
else
{
{