From f89f308c525e9deebc6d2cf6416e27dfe1a299dc Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Sun, 19 May 2019 16:03:38 +0200 Subject: Cleanup DiscoBot Project --- DSACore/Auxiliary/TalentEnumerableExtension.cs | 39 +++++++++----------------- 1 file changed, 14 insertions(+), 25 deletions(-) (limited to 'DSACore/Auxiliary/TalentEnumerableExtension.cs') diff --git a/DSACore/Auxiliary/TalentEnumerableExtension.cs b/DSACore/Auxiliary/TalentEnumerableExtension.cs index a4ace2f..159480d 100644 --- a/DSACore/Auxiliary/TalentEnumerableExtension.cs +++ b/DSACore/Auxiliary/TalentEnumerableExtension.cs @@ -15,12 +15,10 @@ namespace DSACore.Auxiliary var tTalent = List.OrderBy(x => sc.Compare(talent, x.Name)).First(); if (sc.Compare(talent, tTalent.Name) > SpellCorrect.ErrorThreshold) - { return $"{c.Name} kann nicht {talent}..."; - } var props = tTalent.GetEigenschaften(); // get the required properties - int tap = tTalent.Value; // get taw + var tap = tTalent.Value; // get taw var werte = props.Select(p => c.Eigenschaften[c.PropTable[p]]).ToList(); output.AppendFormat( @@ -34,51 +32,42 @@ namespace DSACore.Auxiliary output.Append(" "); tap -= erschwernis; - int gesamtErschwernis = tap; + var gesamtErschwernis = tap; if (gesamtErschwernis < 0) { tap = 0; - for (int i = 0; i <= 2; i++) + for (var i = 0; i <= 2; i++) { // foreach property, dice and tap - int temp = Dice.Roll(); - int eigenschaft = c.Eigenschaften[c.PropTable[props[i]]]; + var temp = Dice.Roll(); + var eigenschaft = c.Eigenschaften[c.PropTable[props[i]]]; - if (eigenschaft + gesamtErschwernis < temp) - { - tap -= temp - (eigenschaft + gesamtErschwernis); - } + if (eigenschaft + gesamtErschwernis < temp) tap -= temp - (eigenschaft + gesamtErschwernis); output.Append($"[{temp}]"); // add to string } - if (tap >= 0) - { - tap = 1; - } + if (tap >= 0) tap = 1; } else { - for (int i = 0; i <= 2; i++) + for (var i = 0; i <= 2; i++) { // foreach property, dice and tap - int temp = Dice.Roll(); - int eigenschaft = c.Eigenschaften[c.PropTable[props[i]]]; + var temp = Dice.Roll(); + var eigenschaft = c.Eigenschaften[c.PropTable[props[i]]]; - if (eigenschaft < temp) - { - tap -= temp - eigenschaft; - } + if (eigenschaft < temp) tap -= temp - eigenschaft; output.Append($"[{temp}]"); // add to string } } - tap = (tap == 0) ? 1 : tap; - + tap = tap == 0 ? 1 : tap; + output.AppendFormat(" tap: {0,2}", tap); return output.ToString(); // return output } } -} +} \ No newline at end of file -- cgit v1.2.3-70-g09d2