diff --git a/mastermind/src/mastermind/Main.java b/mastermind/src/mastermind/Main.java index 8f25dd9..c00d051 100644 --- a/mastermind/src/mastermind/Main.java +++ b/mastermind/src/mastermind/Main.java @@ -464,8 +464,9 @@ class Game extends World { // Draw the solution. WorldImage draw_sol() { - /*if (this.done)*/return this.draw_sol_rev(); - /*else return this.draw_sol_hid();*/ + if (this.won) return this.draw_sol_rev(); + else if (this.done) return this.draw_sol_fail(); + else return this.draw_sol_hid(); } // Draw the revealed answer. @@ -478,11 +479,19 @@ class Game extends World { return new RectangleImage( this.solution.getW(), 2 * Dot.r, - OutlineMode.OUTLINE, + OutlineMode.SOLID, Color.BLACK ); } + // Draw the hidden answer. + WorldImage draw_sol_fail() { + return new OverlayImage( + new TextImage("dumbass.", Color.RED), + this.draw_sol_hid() + ); + } + WorldImage draw_guesses() { return this.guesses.draw(); } @@ -610,7 +619,7 @@ class ConsIncompleteGuess implements ILoGuess { ILoDot solution, boolean premoved ) { - if (!premoved) throw new Error("Here"); + //if (!premoved) throw new Error("Here"); if (this.guessSoFar.full(limit)) { ILoDot guessDots = this.guessSoFar.guessSoFar; Feedback feedback = guessDots.compare(solution);