[gbrainy] Fix some puzzles and wording



commit ff563549d0ad844616247b9a75029afdf24b5260
Author: Jordi Mas <jmas softcatala org>
Date:   Sat Apr 30 17:20:10 2011 +0200

    Fix some puzzles and wording

 data/games.xml                            |    8 ++++----
 data/verbal_analogies.xml                 |    2 +-
 src/Games/Calculation/CalculationRatio.cs |    4 ++--
 src/Games/Logic/PuzzleFigures.cs          |    3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/data/games.xml b/data/games.xml
index d9b6a60..3b88fb1 100644
--- a/data/games.xml
+++ b/data/games.xml
@@ -125,8 +125,8 @@
 				int players = 32 + (random.Next (16) * 2);
 				int rslt = players -1;
 			</variables>
-			<question>How many matches does it take to determine the winner of a tennis tournament that starts with [players] player?</question>
-			<question plural ="[players]">How many matches does it take to determine the winner of a tennis tournament that starts with [players] players?</question>
+			<question>In a tennis tournament, in every match a player is eliminated after losing to a single opponent. How many matches does it take to determine the winner of a tennis tournament that starts with [players] player?</question>
+			<question plural ="[players]">In a tennis tournament, in every match a player is eliminated after losing to a single opponent. How many matches does it take to determine the winner of a tennis tournament that starts with [players] players?</question>
 			<_rationale>In every match you eliminate one player, you need the total number of games minus 1 to find out the winner.</_rationale>
 			<answer>[rslt]</answer>
 		</variant>
@@ -226,7 +226,7 @@
 				double small_box = 1 * 1 * 0.5;
 				double rslt = big_box / small_box;
 			</variables>
-			<_question>How many boxes measuring 1 x 1 x 0.5 can be packed into a container measuring 6 x 5 x [z]?</_question>
+			<_question>How many boxes measuring 1 x 1 x 0.5 can be fit into a container measuring 6 x 5 x [z]?</_question>
 			<answer>[rslt]</answer>
 			<_rationale>You can fit 6 * 5 * [z] * 2 boxes.</_rationale>
 		</variant>
@@ -246,7 +246,7 @@
 				int rslt_a = years_start [idx + 1];
 				int rslt_b = years_end [idx + 1];
 			</variables>
-			<_question>[year_start] is a palindromic year as [year_end] is, a gap of 11 years. What are the next two consecutive palindromic years after [year_end] with the same gap?</_question>
+			<_question>[year_start] is a palindromic year as [year_end] is, a gap of 11 years. What are the next two consecutive palindromic years after [year_end] with the same gap? Answer using two numbers (e.g.: [year_start] and [year_end]).</_question>
 			<_tip>A palindromic number remains the same when its digits are reversed (e.g.: 2112).</_tip>
 			<answer>[rslt_a] | [rslt_b]</answer>
 			<_answer_show>[rslt_a] and [rslt_b]</_answer_show>
diff --git a/data/verbal_analogies.xml b/data/verbal_analogies.xml
index 4983850..f9046bb 100644
--- a/data/verbal_analogies.xml
+++ b/data/verbal_analogies.xml
@@ -69,7 +69,7 @@
 	</analogy>
 
 	<analogy>
-		<_question type = "MultipleOptions">An artist whose work has become the defining style of that genre is?</_question>
+		<_question type = "MultipleOptions">An artist whose work has become the defining style of a genre is?</_question>
 		<_answer correct ="yes">Pioneer</_answer>
 		<!-- Translators: referred to the life style -->
 		<_answer>Bohemian</_answer>
diff --git a/src/Games/Calculation/CalculationRatio.cs b/src/Games/Calculation/CalculationRatio.cs
index 348ac87..4e3f698 100644
--- a/src/Games/Calculation/CalculationRatio.cs
+++ b/src/Games/Calculation/CalculationRatio.cs
@@ -46,8 +46,8 @@ namespace gbrainy.Games.Calculation
 
 		public override string Rationale {
 			get {
-				return String.Format (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("The second number is calculated by multiplying the first by {0} and dividing it by {1}."),
-					ratio_a, ratio_b);
+				return String.Format (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("The second number can be calculated by multiplying the first number by {0} and dividing it by {1}."),
+					ratio_b, ratio_a);
 			}
 		}
 
diff --git a/src/Games/Logic/PuzzleFigures.cs b/src/Games/Logic/PuzzleFigures.cs
index 6009dda..2b0699f 100644
--- a/src/Games/Logic/PuzzleFigures.cs
+++ b/src/Games/Logic/PuzzleFigures.cs
@@ -59,7 +59,8 @@ namespace gbrainy.Games.Logic
 		}
 
 		public override string Question {
-			get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("What is the next logical sequence of objects in the last column? See below the convention when giving the answer.");}
+			get {return String.Format (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("What is the next logical sequence of objects in the last column? Answer {0}, {1} or {2}."),
+				Answer.GetMultiOption (0), Answer.GetMultiOption (1), Answer.GetMultiOption (2));}
 		}
 
 		public override string Rationale {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]