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

big bug ouchie (now gone)

Browse Source
This commit is contained in:
Lan
2021-04-03 22:56:48 +03:00
parent 8b41386d07
commit dd2ca3ec3f
1 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Kehyeedra3/Commands/Economy.cs
View File

@@ -193,7 +193,7 @@ namespace Kehyeedra3.Commands
public async Task FishCommand() public async Task FishCommand()
{ {
ulong time = ulong.Parse(DateTime.Now.ToString("yyyyMMddHHmm")); ulong time = ulong.Parse(DateTime.Now.ToString("yyyyMMddHHmm"));
ulong totalXp = 0; ulong totalXp;
ulong xp = 0; ulong xp = 0;
ulong level = 0; ulong level = 0;
ulong lvlXp = 0; ulong lvlXp = 0;
@@ -288,7 +288,7 @@ namespace Kehyeedra3.Commands
int rari = SRandom.Next(0, 2001); int rari = SRandom.Next(0, 2001);
int weigh = SRandom.Next(10, 1501+prestige*500); int weigh = SRandom.Next(10, 1501+prestige*500);
int tierRoll = SRandom.Next(0, 20*rod+10*prestige+11); int tierRoll = SRandom.Next(0, (20*rod)+(10*prestige)+11);
int dCatchRoll = SRandom.Next(1, 1000)+prestige*20; int dCatchRoll = SRandom.Next(1, 1000)+prestige*20;
int dcatch = 1; int dcatch = 1;
@@ -355,22 +355,22 @@ namespace Kehyeedra3.Commands
FishTier ftier; FishTier ftier;
if (tierRoll > 60 && rod >= 3) if (tierRoll > 60 && rod >= 3)
{ {
fishTiers = fishes.Where(f => (int)f.Tier == (int)FishTier.T4).ToList(); fishTiers = fishes.Where(f => f.Tier == FishTier.T4).ToList();
ftier = FishTier.T4; ftier = FishTier.T4;
} }
else if (tierRoll > 40 && rod >= 2) else if (tierRoll > 40 && rod >= 2)
{ {
fishTiers = fishes.Where(f => (int)f.Tier == (int)FishTier.T3).ToList(); fishTiers = fishes.Where(f => f.Tier == FishTier.T3).ToList();
ftier = FishTier.T3; ftier = FishTier.T3;
} }
else if (tierRoll > 20 && rod >= 1) else if (tierRoll > 20 && rod >= 1)
{ {
fishTiers = fishes.Where(f => (int)f.Tier == (int)FishTier.T2).ToList(); fishTiers = fishes.Where(f => f.Tier == FishTier.T2).ToList();
ftier = FishTier.T2; ftier = FishTier.T2;
} }
else else
{ {
fishTiers = fishes.Where(f => (int)f.Tier == (int)FishTier.T1).ToList(); fishTiers = fishes.Where(f => f.Tier == FishTier.T1).ToList();
ftier = FishTier.T1; ftier = FishTier.T1;
} }
@@ -410,14 +410,14 @@ namespace Kehyeedra3.Commands
if (wRoll == 77 && bSpe) if (wRoll == 77 && bSpe)
{ {
List<Fish> possibleFishes = fishes.Where(f => (int)f.Rarity == (int)FishRarity.Unreasonable).ToList(); fishRarities = fishes.Where(f => (int)f.Rarity == (int)FishRarity.Unreasonable).ToList();
fish = possibleFishes[SRandom.Next(possibleFishes.Count)];
xp = 7777; xp = 7777;
} }
} }
else if (rarity > 1700) else if (rarity > 1700)
{ {
fishRarities = fishTiers.Where(f => (int)f.Rarity == (int)FishRarity.Uncommon).ToList(); fishRarities = fishTiers.Where(f => (int)f.Rarity == (int)FishRarity.Uncommon).ToList();
switch (ftier) switch (ftier)
{ {
case FishTier.T1: case FishTier.T1:
@@ -473,36 +473,37 @@ namespace Kehyeedra3.Commands
break; break;
} }
} }
else
}
else
{
fishRarities = fishTiers.Where(f => (int)f.Rarity == (int)FishRarity.Common).ToList();
switch (ftier)
{ {
fishRarities = fishTiers.Where(f => (int)f.Rarity == (int)FishRarity.Common).ToList(); case FishTier.T1:
switch (ftier) {
{ xp = 5;
case FishTier.T1: }
{ break;
xp = 5; case FishTier.T2:
} {
break; xp = 7;
case FishTier.T2: }
{ break;
xp = 7; case FishTier.T3:
} {
break; xp = 9;
case FishTier.T3: }
{ break;
xp = 9; case FishTier.T4:
} {
break; xp = 11;
case FishTier.T4: }
{ break;
xp = 11;
}
break;
}
} }
} }
fish = fishRarities[SRandom.Next(fishRarities.Count)];
fish = fishRarities[SRandom.Next(fishRarities.Count)];
FishSize size; FishSize size;