gbrainy r214 - trunk/src

[jmas svn gnome org]

Author: jmas
Date: Tue Feb 12 14:02:12 2008
New Revision: 214
URL: http://svn.gnome.org/viewvc/gbrainy?rev=214&view=rev

Log:
2008-02-12 Jordi Mas <jmas softcatala org>

	* PuzzleBuildTriangle.cs: Standardizes memory question
	* Makefile.am: Add new logic puzzle
	* GameManager.cs: Add new logic puzzle
	* PuzzlePeopleTable.cs: Fixes English strings
	* PuzzleBuildTriangle.cs: New logic puzzle



Added:
   trunk/src/PuzzleBuildTriangle.cs
Modified:
   trunk/src/ChangeLog
   trunk/src/GameManager.cs
   trunk/src/Makefile.am
   trunk/src/PuzzlePeopleTable.cs

Modified: trunk/src/GameManager.cs
==============================================================================
--- trunk/src/GameManager.cs	(original)
+++ trunk/src/GameManager.cs	Tue Feb 12 14:02:12 2008
@@ -51,7 +51,8 @@
 		typeof (PuzzleLines),
 		typeof (PuzzleTetris),
 		typeof (PuzzleMissingPiece),
-		typeof (PuzzleMostInCommon)
+		typeof (PuzzleMostInCommon),
+		typeof (PuzzleBuildTriangle),
 	};
 
 	static Type[] MathTrainers = new Type[] 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Feb 12 14:02:12 2008
@@ -53,6 +53,7 @@
 	$(srcdir)/PuzzleMissingPiece.cs		\
 	$(srcdir)/MemoryIndications.cs		\
 	$(srcdir)/PuzzleMostInCommon.cs		\
+	$(srcdir)/PuzzleBuildTriangle.cs	\
 	$(srcdir)/gbrainy.cs			
 
 ASSEMBLIES = \

Added: trunk/src/PuzzleBuildTriangle.cs
==============================================================================
--- (empty file)
+++ trunk/src/PuzzleBuildTriangle.cs	Tue Feb 12 14:02:12 2008
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2008 Jordi Mas i HernÃndez <jmas softcatala org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+using System;
+using Cairo;
+using Mono.Unix;
+
+public class PuzzleBuildTriangle : Game
+{
+	public enum Figures
+	{
+		TriangleA,
+		TriangleB,
+		TriangleC,
+		Square,
+		Diamon,
+		LongRectangle,
+		LongRectangleUp,
+		TriangleD,
+	}
+
+	private const double figure_size = 0.1;
+	private ArrayListIndicesRandom random_indices_answers;
+	private char [] answers;
+	private const int answer_num = 3;
+	private int total_figures;
+	private double space_figures;
+	private double radian = Math.PI / 180;
+
+	public override string Name {
+		get {return Catalog.GetString ("Build a triangle");}
+	}
+
+	public override string Question {
+		get {return Catalog.GetString ("Which three pieces can you use together to build a triangle?");} 
+	}
+
+	public override void Initialize ()
+	{
+		switch (CurrentDifficulty) {
+		case Difficulty.Easy:
+			total_figures = 6;
+			space_figures = 0.26;
+			break;
+		case Difficulty.Medium:
+		case Difficulty.Master:
+			total_figures = 8;
+			space_figures = 0.2;
+			break;
+		}
+
+		random_indices_answers = new ArrayListIndicesRandom (total_figures);
+		random_indices_answers.Initialize ();
+		answers = new char[answer_num];
+
+		for (int i = 0; i < random_indices_answers.Count; i++)
+		{
+			switch ((Figures) random_indices_answers[i]) {
+			case Figures.TriangleB:
+				answers[0] =  (char) (65 + i);
+				break;
+			case Figures.TriangleC:
+				answers[1] =  (char) (65 + i);
+				break;
+			case Figures.Square:
+				answers[2] =  (char) (65 + i);
+				break;
+			}
+		}
+
+		right_answer = answers[0].ToString () + answers[1].ToString () + answers[2].ToString ();		
+	}
+
+	private void DrawFigure (Cairo.Context gr, double x, double y, Figures figure)
+	{
+		switch (figure) {
+		case Figures.TriangleA:
+			DrawingHelpers.DrawEquilateralTriangle (gr, x, y, figure_size);
+			break;
+		case Figures.TriangleB:
+			gr.MoveTo (x, y);
+			gr.LineTo (x, y + figure_size);
+			gr.LineTo (x + figure_size, y);
+			gr.LineTo (x, y);
+			gr.Stroke ();
+			break;
+		case Figures.TriangleC:
+			gr.MoveTo (x, y);
+			gr.LineTo (x, y + figure_size);
+			gr.LineTo (x + figure_size, y + figure_size);
+			gr.LineTo (x, y);
+			gr.Stroke ();
+			break;
+		case Figures.Square:
+			gr.Rectangle (x, y, figure_size, figure_size);
+			gr.Stroke ();
+			break;
+		case Figures.LongRectangle:
+			gr.Rectangle (x, y + figure_size / 2, figure_size, figure_size / 2);
+			gr.Stroke ();
+			break;
+		case Figures.LongRectangleUp:
+			gr.Rectangle (x, y, figure_size, figure_size / 2);
+			gr.Stroke ();
+			break;
+		case Figures.Diamon:
+			DrawingHelpers.DrawDiamond (gr, x, y, figure_size);
+			break;
+		case Figures.TriangleD:
+			gr.MoveTo (x, y);
+			gr.LineTo (x, y + figure_size * 0.7);
+			gr.LineTo (x + figure_size * 0.7, y + figure_size * 0.7);
+			gr.LineTo (x, y);
+			gr.Stroke ();
+			break;
+		}
+	}
+
+	public override void Draw (Cairo.Context gr, int area_width, int area_height)
+	{
+		double x = DrawAreaX + 0.05, y = DrawAreaY + 0.05;
+		double degrees, x1, x2, dist;
+
+		gr.Scale (area_width, area_height);
+		DrawBackground (gr);
+		PrepareGC (gr);
+
+		for (int i = 0; i < random_indices_answers.Count; i++)	
+		{
+			DrawFigure (gr, x, y, (Figures) random_indices_answers[i]);
+			gr.MoveTo (x, y + 0.15);
+			gr.ShowText (String.Format (Catalog.GetString ("Figure {0}"), (char) (65 + i)));
+
+			if (i  == (total_figures / 2) - 1) {
+				y+= 0.25;
+				x= DrawAreaX + 0.05;
+			}
+			else
+				x+= space_figures;
+		}
+
+		if (DrawAnswer == false)
+			return;
+
+		gr.MoveTo (DrawAreaX, y + 0.28);
+		gr.ShowText (Catalog.GetString ("The triangle is:"));
+		gr.Stroke ();
+		
+		x = DrawAreaX + 0.35;
+		y += 0.35;
+
+		degrees = radian * 45;	// First triangle
+		gr.MoveTo (x, y);
+		x1 = x + figure_size * Math.Cos (degrees);
+		gr.LineTo (x1, y + figure_size * Math.Sin (degrees));
+
+		degrees = radian * (135);
+		x2 = x + figure_size * Math.Cos (degrees);
+		gr.MoveTo (x, y);
+		gr.LineTo (x2, y + figure_size * Math.Sin (degrees));
+		gr.LineTo (x1, y + figure_size * Math.Sin (degrees));
+		dist = (x1 - x2);
+		x += dist;
+
+		degrees = radian * 45; // Second triangle
+		gr.MoveTo (x, y);
+		x1 = x + figure_size * Math.Cos (degrees);
+		gr.LineTo (x1, y + figure_size * Math.Sin (degrees));
+
+		degrees = radian * (135);
+		x2 = x + figure_size * Math.Cos (degrees);
+		gr.MoveTo (x, y);
+		gr.LineTo (x2, y + figure_size * Math.Sin (degrees));
+		gr.LineTo (x1, y + figure_size * Math.Sin (degrees));
+
+		degrees = radian * (-45); // Bottom
+		x =  DrawAreaX + 0.35;
+		gr.MoveTo (x, y);
+		gr.LineTo (x + figure_size * Math.Cos (degrees), y + figure_size * Math.Sin (degrees));
+
+		x += dist;
+		degrees = radian * (-135);
+		gr.MoveTo (x, y);
+		gr.LineTo (x + figure_size * Math.Cos (degrees), y + figure_size * Math.Sin (degrees));
+		gr.Stroke ();	
+	}
+
+	private bool IndexOf (char c, char [] chars)
+	{
+		for (int i = 0; i < chars.Length; i++)
+			if (c == chars [i]) return true;
+
+		return false;
+	}
+
+	public override bool CheckAnswer (string a)
+	{	
+		char fig1 = '\0', fig2 = '\0', fig3 = '\0';
+		char [] ans = new char [answer_num];
+		int c = 0, matches = 0;
+		char[] opers = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'};
+		string answer = a.ToUpper ();
+
+		for (int i = 0; i < answer_num; i++)
+			ans[i] = answers[i];
+		
+		for (c = 0; c < answer.Length; c++)
+		{
+			if (IndexOf (answer[c], opers)) {
+				fig1 = answer[c];
+				break;
+			}			
+		}
+
+		for (c++; c < answer.Length; c++)
+		{
+			if (IndexOf (answer[c], opers)) {
+				fig2 = answer[c];
+				break;
+			}
+		}
+
+		for (c++; c < answer.Length; c++)
+		{
+			if (IndexOf (answer[c], opers)) {
+				fig3 = answer[c];
+				break;
+			}
+		}
+
+		if (fig1 == '\0' || fig2 == '\0' || fig3 == '\0')
+			return false;
+	
+		for (int i = 0; i < answer_num; i++)
+		{
+			if (fig1 != ans[i] || ans[i] == '\0')
+				continue;
+
+			matches++;
+			ans[i] = '\0';
+			break;			
+		}
+
+		for (int i = 0; i < answer_num; i++)
+		{
+			if (fig2 != ans[i] || ans[i] == '\0')
+				continue;
+
+			matches++;
+			ans[i] = '\0';
+			break;			
+		}
+
+		for (int i = 0; i < answer_num; i++)
+		{
+			if (fig3 != ans[i] || ans[i] == '\0')
+				continue;
+
+			matches++;
+			ans[i] = '\0';
+			break;			
+		}
+
+		if (matches == answer_num)
+			return true;
+
+		return false;
+	}	
+}
+
+

Modified: trunk/src/PuzzlePeopleTable.cs
==============================================================================
--- trunk/src/PuzzlePeopleTable.cs	(original)
+++ trunk/src/PuzzlePeopleTable.cs	Tue Feb 12 14:02:12 2008
@@ -43,13 +43,13 @@
 	}
 
 	public override string Question {
-		get {return String.Format (Catalog.GetString ("A group of people evenly separated is sat in a round table. How many people are if the {0} person is in front of the {1}?"), ques1, ques2);} 
+		get {return String.Format (Catalog.GetString ("A group of people are sitting at round table, evenly spaced out. How many people are there if the {0} person is across from the {1}?"), ques1, ques2);} 
 	}
 
 	public override string Answer {
 		get { 
 			string answer = base.Answer + " ";
-			answer += Catalog.GetString ("Substracting the two positions you get how many people is sat in half of the table then the double is the total amount of people.");
+			answer += Catalog.GetString ("Subtracting the two positions you get how many people is sat in half of the table then the double is the total amount of people.");
 			return answer;
 		}
 	}