gbrainy r230 - trunk/src

[jmas svn gnome org]

Author: jmas
Date: Tue Feb 19 19:31:39 2008
New Revision: 230
URL: http://svn.gnome.org/viewvc/gbrainy?rev=230&view=rev

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

	* PuzzleClocks.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/PuzzleClocks.cs
Modified:
   trunk/src/ChangeLog
   trunk/src/GameManager.cs
   trunk/src/Makefile.am
   trunk/src/gbrainy.cs

Modified: trunk/src/GameManager.cs
==============================================================================
--- trunk/src/GameManager.cs	(original)
+++ trunk/src/GameManager.cs	Tue Feb 19 19:31:39 2008
@@ -53,6 +53,7 @@
 		typeof (PuzzleMissingPiece),
 		typeof (PuzzleMostInCommon),
 		typeof (PuzzleBuildTriangle),
+		typeof (PuzzleClocks),
 	};
 
 	static Type[] CalculationTrainers = new Type[] 
@@ -171,8 +172,8 @@
 				enumerator.MoveNext ();
 			}
 
-			puzzle =  (Game) Activator.CreateInstance ((Type) games [(int) enumerator.Current], true);
-			//puzzle =  (Game) Activator.CreateInstance (MemoryTrainers [2], true);
+			//puzzle =  (Game) Activator.CreateInstance ((Type) games [(int) enumerator.Current], true);
+			puzzle =  (Game) Activator.CreateInstance (LogicPuzzles [29], true);
 			if (first != null && first.GetType () == puzzle.GetType ())
 				break;
 				

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Feb 19 19:31:39 2008
@@ -54,6 +54,7 @@
 	$(srcdir)/PuzzleMostInCommon.cs		\
 	$(srcdir)/PuzzleBuildTriangle.cs	\
 	$(srcdir)/CairoContextEx.cs		\
+	$(srcdir)/PuzzleClocks.cs		\
 	$(srcdir)/gbrainy.cs			
 
 ASSEMBLIES = \

Added: trunk/src/PuzzleClocks.cs
==============================================================================
--- (empty file)
+++ trunk/src/PuzzleClocks.cs	Tue Feb 19 19:31:39 2008
@@ -0,0 +1,129 @@
+/*
+ * 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 Cairo;
+using Mono.Unix;
+using System;
+
+public class PuzzleClocks : Game
+{
+	private const double figure_size = 0.3;
+	private const double radian = Math.PI / 180;
+	private int addition;
+	private int []handles;
+	private const int clocks = 4;
+	private const int handle_num = 2;
+
+	public override string Name {
+		get {return Catalog.GetString ("Clocks");}
+	}
+
+	public override string Question {
+		get {return Catalog.GetString ("To what number should the large handle of the last clock point?");} 
+	}
+
+	public override string Answer {
+		get { 
+			string answer = base.Answer + " ";
+			answer += String.Format (Catalog.GetString ("Starting from the first clock sum {0} to the value indicated by the hands."), addition);
+			return answer;
+		}
+	}
+
+	public override string Tip {
+		get { return Catalog.GetString ("The clocks do not follow the time logic.");}
+	}
+
+	public override void Initialize ()
+	{
+		int position = 11 + random.Next (2);
+		addition = 11 + random.Next (5);
+
+		if (addition == 12) addition ++;
+
+		handles = new int [clocks * handle_num];
+
+		for (int i = 0; i < handles.Length; i++, i++)
+		{
+			handles [i] = position / 10;
+			handles [i + 1] = position - ((position / 10) * 10);
+			position += addition;
+		}
+		right_answer = handles[7].ToString ();
+	}	
+
+	public void DrawClock (CairoContextEx gr, double x, double y, int hand_short, int hand_large, bool draw_large)
+	{
+		double radius = figure_size / 2;
+		double x0, y0;
+		int num, degrees;
+
+		gr.Arc (x, y, radius, 0, 2 * Math.PI);
+		gr.Stroke ();
+		for (degrees = 0; degrees < 360; degrees+= 30) {
+			x0 = radius * Math.Cos (degrees * radian);
+			y0 = radius * Math.Sin (degrees * radian);
+			 // Small lines
+			gr.MoveTo (x + 0.9 * x0, y + 0.9 * y0);
+			gr.LineTo (x + x0, y + y0);
+			gr.Stroke ();
+			// Numbers
+			num = (degrees / 30) + 3;
+			if (num > 12) num = num - 12;
+
+			gr.DrawTextCentered (x + x0 * 0.75,  y + y0 * 0.75, num.ToString ());
+			gr.Stroke ();
+		}
+
+		if (draw_large) {
+			// Hand Large
+			degrees = (hand_large - 3) * 30; 
+			x0 = radius * Math.Cos (degrees * radian);
+			y0 = radius * Math.Sin (degrees * radian);
+			gr.MoveTo (x, y);
+			gr.LineTo (x + x0 * 0.55, y + y0 * 0.55);
+			gr.Stroke ();
+		}
+		// Hand Short
+		degrees = (hand_short - 3) * 30; 
+		x0 = radius * Math.Cos (degrees * radian);
+		y0 = radius * Math.Sin (degrees * radian);
+		gr.MoveTo (x, y);
+		gr.LineTo (x + x0 * 0.4, y + y0 * 0.4);
+		gr.Stroke ();
+	}
+
+	public override void Draw (CairoContextEx gr, int area_width, int area_height)
+	{
+		double x = DrawAreaX + 0.1, y = DrawAreaY + 0.1;
+
+		gr.Scale (area_width, area_height);
+
+		DrawBackground (gr);
+		PrepareGC (gr);
+		
+		DrawClock (gr, x + 0.1, y + 0.1, handles[0], handles[1], true);
+		DrawClock (gr, x + 0.5, y + 0.1, handles[2], handles[3], true);
+
+		DrawClock (gr, x + 0.1, y + 0.5, handles[4], handles[5], true);
+		DrawClock (gr, x + 0.5, y + 0.5, handles[6], handles[7], DrawAnswer == true);
+	}
+}
+
+

Modified: trunk/src/gbrainy.cs
==============================================================================
--- trunk/src/gbrainy.cs	(original)
+++ trunk/src/gbrainy.cs	Tue Feb 19 19:31:39 2008
@@ -44,8 +44,8 @@
 	GameSession session;
 	const int ok_buttonid = -5;
 	ToolButton pause_tbbutton;
-	int memquestion_time = 4;
-	bool memquestion_warn = true;
+	int memquestion_time = 0;
+	bool memquestion_warn = false;
 	Game.Difficulty difficulty = Game.Difficulty.Medium;
  
 	public gbrainy (string [] args, params object [] props)
@@ -116,7 +116,7 @@
 
 		question_label.Text = string.Empty;
 		ActiveInputControls (false);
-		//OnMemoryOnly (this, EventArgs.Empty); // temp
+		OnMemoryOnly (this, EventArgs.Empty); // temp
 	}
 	
 	public int MemQuestionTime {