diff --git a/60_Mastermind/csharp/Program.cs b/60_Mastermind/csharp/Program.cs index 13f525d7..596b552d 100644 --- a/60_Mastermind/csharp/Program.cs +++ b/60_Mastermind/csharp/Program.cs @@ -152,7 +152,7 @@ namespace Game if (isCandidate[index]) { var (candidateBlacks, candidateWhites) = guess.Compare(candidate); - if (blacks != candidateBlacks || whites != candidateWhites) + if (blacks > candidateBlacks || whites > candidateWhites) isCandidate[index] = false; } } diff --git a/60_Mastermind/javascript/mastermind.js b/60_Mastermind/javascript/mastermind.js index 32639fc7..5c91575b 100644 --- a/60_Mastermind/javascript/mastermind.js +++ b/60_Mastermind/javascript/mastermind.js @@ -269,6 +269,8 @@ async function main() print("YOU GUESSED IT IN " + m + " MOVES!\n"); break; } + //tell human results + print("YOU HAVE " + b + " BLACKS AND " + w + " WHITES.") // Save all this stuff for board printout later ss[m] = str; sa[m] = []; @@ -341,7 +343,7 @@ async function main() copy_hs(); convert_qa(); get_number(); - if (b1 != b || w1 != w) + if (b1 > b || w1 > w) ia[x] = 0; } } diff --git a/60_Mastermind/mastermind.bas b/60_Mastermind/mastermind.bas index e6d54893..215cdd18 100644 --- a/60_Mastermind/mastermind.bas +++ b/60_Mastermind/mastermind.bas @@ -113,7 +113,7 @@ 1035 GOSUB 6500 1040 GOSUB 4000 1050 GOSUB 4500 -1060 IF B1<>B OR W1<>W THEN I(X)=0 +1060 IF B1>B OR W1>W THEN I(X)=0 1070 NEXT X 1080 NEXT M 1090 PRINT "I USED UP ALL MY MOVES!" diff --git a/60_Mastermind/python/mastermind.py b/60_Mastermind/python/mastermind.py index 61a98ef7..c2b4120a 100644 --- a/60_Mastermind/python/mastermind.py +++ b/60_Mastermind/python/mastermind.py @@ -153,7 +153,7 @@ def main(): human_readable_possibility, human_readable_guess ) print(comparison) - if (blacks != comparison[1]) or (whites != comparison[2]): + if (blacks > comparison[1]) or (whites > comparison[2]): all_possibilities[i] = 0 if not turn_over: # COMPUTER DID NOT GUESS print("I USED UP ALL MY MOVES!")