From c14e676029f6cde056a092cc75f1a8403349a442 Mon Sep 17 00:00:00 2001 From: "t.ruspekhofer" Date: Tue, 8 Mar 2022 00:49:07 +0100 Subject: [PATCH] changed boons to bool since all boons go to 5 people --- Lieb/Data/RaidRandomizerService.cs | 64 ++++++++----------- Lieb/Pages/GuildWars2/BuildEdit.razor | 16 ++--- Lieb/Pages/GuildWars2/BuildOverview.razor | 8 +-- Lieb/Pages/User/ManageGuildWars2Account.razor | 8 +-- 4 files changed, 44 insertions(+), 52 deletions(-) diff --git a/Lieb/Data/RaidRandomizerService.cs b/Lieb/Data/RaidRandomizerService.cs index aeec738..a2671c4 100644 --- a/Lieb/Data/RaidRandomizerService.cs +++ b/Lieb/Data/RaidRandomizerService.cs @@ -134,10 +134,10 @@ namespace Lieb.Data foreach(GuildWars2Build build in signedUpUsers.Values) { - Alac += build.Alacrity; - Quick += build.Quickness; - Heal += build.Heal; - Might += build.Might; + Alac += build.Alacrity ? 5 : 0; + Quick += build.Quickness ? 5 : 0; + Heal += build.Heal ? 5 : 0; + Might += build.Might ? 5 : 0; } if(Alac > 10) { @@ -186,15 +186,14 @@ namespace Lieb.Data { foreach (var userBuild in signedUpUsers) { - if(userBuild.Value.Alacrity > 0 && currentAlac > 10) + if(userBuild.Value.Alacrity && currentAlac > 10) { RaidSignUp signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == userBuild.Key); - Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Alacrity == 0).OrderBy(u => _random.Next()).FirstOrDefault(); + Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => !b.GuildWars2Build.Alacrity).OrderBy(u => _random.Next()).FirstOrDefault(); if (newBuild != null) { - currentAlac -= userBuild.Value.Alacrity; signedUpUsers[userBuild.Key] = newBuild.GuildWars2Build; - currentAlac += signedUpUsers[userBuild.Key].Alacrity; + currentAlac -= 5; } } } @@ -204,15 +203,14 @@ namespace Lieb.Data { foreach (var userBuild in signedUpUsers) { - if (userBuild.Value.Alacrity == 00 && currentAlac < 10) + if (!userBuild.Value.Alacrity && currentAlac < 10) { RaidSignUp signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == userBuild.Key); - Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Alacrity > 0).OrderBy(u => _random.Next()).FirstOrDefault(); + Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Alacrity).OrderBy(u => _random.Next()).FirstOrDefault(); if (newBuild != null) { - currentAlac -= userBuild.Value.Alacrity; signedUpUsers[userBuild.Key] = newBuild.GuildWars2Build; - currentAlac += signedUpUsers[userBuild.Key].Alacrity; + currentAlac += 5; } } } @@ -222,15 +220,14 @@ namespace Lieb.Data { foreach (var userBuild in signedUpUsers) { - if (userBuild.Value.Quickness > 0 && currentQuick > 10) + if (userBuild.Value.Quickness && currentQuick > 10) { RaidSignUp signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == userBuild.Key); - Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Quickness == 0).OrderBy(u => _random.Next()).FirstOrDefault(); + Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => !b.GuildWars2Build.Quickness).OrderBy(u => _random.Next()).FirstOrDefault(); if (newBuild != null) { - currentQuick -= userBuild.Value.Quickness; signedUpUsers[userBuild.Key] = newBuild.GuildWars2Build; - currentQuick += signedUpUsers[userBuild.Key].Quickness; + currentQuick -=5; } } } @@ -240,15 +237,14 @@ namespace Lieb.Data { foreach (var userBuild in signedUpUsers) { - if (userBuild.Value.Quickness == 00 && currentQuick < 10) + if (!userBuild.Value.Quickness && currentQuick < 10) { RaidSignUp signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == userBuild.Key); - Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Quickness > 0).OrderBy(u => _random.Next()).FirstOrDefault(); + Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Quickness).OrderBy(u => _random.Next()).FirstOrDefault(); if (newBuild != null) { - currentQuick -= userBuild.Value.Quickness; signedUpUsers[userBuild.Key] = newBuild.GuildWars2Build; - currentQuick += signedUpUsers[userBuild.Key].Quickness; + currentQuick += 5; } } } @@ -258,15 +254,14 @@ namespace Lieb.Data { foreach (var userBuild in signedUpUsers) { - if (userBuild.Value.Might > 0 && currentMight > 10) + if (userBuild.Value.Might && currentMight > 10) { RaidSignUp signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == userBuild.Key); - Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Might == 0).OrderBy(u => _random.Next()).FirstOrDefault(); + Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => !b.GuildWars2Build.Might).OrderBy(u => _random.Next()).FirstOrDefault(); if (newBuild != null) { - currentMight -= userBuild.Value.Might; signedUpUsers[userBuild.Key] = newBuild.GuildWars2Build; - currentMight += signedUpUsers[userBuild.Key].Might; + currentMight -=5; } } } @@ -276,15 +271,14 @@ namespace Lieb.Data { foreach (var userBuild in signedUpUsers) { - if (userBuild.Value.Might == 00 && currentMight < 10) + if (!userBuild.Value.Might && currentMight < 10) { RaidSignUp signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == userBuild.Key); - Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Might > 0).OrderBy(u => _random.Next()).FirstOrDefault(); + Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Might).OrderBy(u => _random.Next()).FirstOrDefault(); if (newBuild != null) { - currentMight -= userBuild.Value.Might; signedUpUsers[userBuild.Key] = newBuild.GuildWars2Build; - currentMight += signedUpUsers[userBuild.Key].Might; + currentMight += 5; } } } @@ -294,15 +288,14 @@ namespace Lieb.Data { foreach (var userBuild in signedUpUsers) { - if (userBuild.Value.Heal > 0 && currentHeal > 10) + if (userBuild.Value.Heal && currentHeal > 10) { RaidSignUp signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == userBuild.Key); - Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Heal == 0).OrderBy(u => _random.Next()).FirstOrDefault(); + Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => !b.GuildWars2Build.Heal).OrderBy(u => _random.Next()).FirstOrDefault(); if (newBuild != null) { - currentHeal -= userBuild.Value.Heal; signedUpUsers[userBuild.Key] = newBuild.GuildWars2Build; - currentHeal += signedUpUsers[userBuild.Key].Heal; + currentHeal -= 5; } } } @@ -312,15 +305,14 @@ namespace Lieb.Data { foreach (var userBuild in signedUpUsers) { - if (userBuild.Value.Heal == 00 && currentHeal < 10) + if (!userBuild.Value.Heal && currentHeal < 10) { RaidSignUp signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == userBuild.Key); - Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Heal > 0).OrderBy(u => _random.Next()).FirstOrDefault(); + Equipped newBuild = signUp.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.Heal).OrderBy(u => _random.Next()).FirstOrDefault(); if (newBuild != null) { - currentHeal -= userBuild.Value.Heal; signedUpUsers[userBuild.Key] = newBuild.GuildWars2Build; - currentHeal += signedUpUsers[userBuild.Key].Heal; + currentHeal += 5; } } } diff --git a/Lieb/Pages/GuildWars2/BuildEdit.razor b/Lieb/Pages/GuildWars2/BuildEdit.razor index df50180..7f63c25 100644 --- a/Lieb/Pages/GuildWars2/BuildEdit.razor +++ b/Lieb/Pages/GuildWars2/BuildEdit.razor @@ -24,26 +24,26 @@

diff --git a/Lieb/Pages/GuildWars2/BuildOverview.razor b/Lieb/Pages/GuildWars2/BuildOverview.razor index a935c5a..b9df04c 100644 --- a/Lieb/Pages/GuildWars2/BuildOverview.razor +++ b/Lieb/Pages/GuildWars2/BuildOverview.razor @@ -35,10 +35,10 @@ @build.Class.ToString() @build.EliteSpecialization.ToString() - @build.Might.ToString() - @build.Heal.ToString() - @build.Quickness.ToString() - @build.Alacrity.ToString() + + + + } diff --git a/Lieb/Pages/User/ManageGuildWars2Account.razor b/Lieb/Pages/User/ManageGuildWars2Account.razor index 80cad77..ebddd3a 100644 --- a/Lieb/Pages/User/ManageGuildWars2Account.razor +++ b/Lieb/Pages/User/ManageGuildWars2Account.razor @@ -70,10 +70,10 @@ @build.BuildName @build.Class.ToString() @build.EliteSpecialization.ToString() - - - - + + + + }