[gbrainy] Improvements to some logic puzzle texts



commit 1741396600d0fc93d08cc4f3d57f7e4b5ea0d7c4
Author: Jordi Mas <jmas softcatala org>
Date:   Thu Apr 28 00:00:31 2011 +0200

    Improvements to some logic puzzle texts

 data/games.xml            |   16 ++++++++--------
 tools/GameXmlGetString.cs |   12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/data/games.xml b/data/games.xml
index 7052f76..d9b6a60 100644
--- a/data/games.xml
+++ b/data/games.xml
@@ -323,14 +323,13 @@
 			<variables>
 				int men = 10 + random.Next (40);
 				int horses = 10 + random.Next (40);
-				int legs = 2 *  men + horses * 4;
+				int legs = 2 * men + horses * 4;
 				int eyes = (men + horses) * 2;
 			</variables>
-			<_question>In a horse race there are people and horses. You can count [eyes] eye and [legs] leg. How many horses are present?</_question>
-			<question plural ="[eyes]">In a horse race there are people and horses. You can count [eyes] eyes and [legs] legs. How many horses are present?</question>
+			<_question>In a horse race there are people and horses. You count [eyes] eye and [legs] leg. How many horses are present?</_question>
+			<question plural ="[eyes]">In a horse race there are people and horses. You count [eyes] eyes and [legs] legs. How many horses are present?</question>
 			<answer>[horses]</answer>
-			<_rationale>There is [men] person and [horses] horse.</_rationale>
-			<_rationale plural ="[eyes]">There are [men] people and [horses] horses.</_rationale>
+			<_rationale>Every person has two legs and every horse four (2 * [men] + [horses] * 4). Every person and every horse have also two eyes (2 * [men] + 2 * [horses]).</_rationale>
 		</variant>
 	</game>
 
@@ -566,8 +565,8 @@
 				double answer_d = (0.90 / (john_speed + friend_speed));
 			</variables>
 
-			<question>John needs [john_time] hour to clean a warehouse and his friend half of the time. How many hours would take them to clean up the warehouse if they work together? [option_answers]</question>
-			<question plural ="[john_time]">John needs [john_time] hours to clean a warehouse and his friend half of the time. How many hours would take them to clean up the warehouse if they work together? [option_answers]</question>
+			<question>John needs [john_time] hour to clean a warehouse and his friend half of John's time. How many hours would take them to clean up the warehouse if they work together? [option_answers]</question>
+			<question plural ="[john_time]">John needs [john_time] hours to clean a warehouse and his friend half of John's time. How many hours would take them to clean up the warehouse if they work together? [option_answers]</question>
 		</variant>
 
 		<variant>
@@ -608,7 +607,8 @@
 			<string _text = "[option_prefix] [answer_d]" x = "0.05" y = "0.02" size = "large"/>
 		</option>
 
-		<_rationale>John cleans at speed of 1 / [john_time] per hour and his friend at 1 / [friend], both combined need [answer_a] hours.</_rationale>
+		<rationale>John cleans at speed of 1 / [john_time] per hour and his friend at 1 / [friend], both together need [answer_a] hour.</rationale>
+		<rationale plural ="[answer_a]">John cleans at speed of 1 / [john_time] per hour and his friend at 1 / [friend], both together need [answer_a] hours.</rationale>
 		<answer>[answer_a]</answer>
 	</game>
 
diff --git a/tools/GameXmlGetString.cs b/tools/GameXmlGetString.cs
index 7c9949f..72e33f8 100644
--- a/tools/GameXmlGetString.cs
+++ b/tools/GameXmlGetString.cs
@@ -62,16 +62,16 @@ public class GameXmlSttringFactory
 			"You have [money] monetary units in your bank account at 10% compound interest annually. How much money will you have at end of 2 years?",
 			variable);
 
-		Catalog.GetPluralString ("In a horse race there are people and horses. You can count [eyes] eye and [legs] leg. How many horses are present?",
-			"In a horse race there are people and horses. You can count [eyes] eyes and [legs] legs. How many horses are present?",
+		Catalog.GetPluralString ("In a horse race there are people and horses. You count [eyes] eye and [legs] leg. How many horses are present?",
+			"In a horse race there are people and horses. You count [eyes] eyes and [legs] legs. How many horses are present?",
 			variable);
 
-		Catalog.GetPluralString ("There is [men] person and [horses] horse.",
-			"There are [men] people and [horses] horses.",
+		Catalog.GetPluralString ("John cleans at speed of 1 / [john_time] per hour and his friend at 1 / [friend], both together need [answer_a] hour.",
+			"John cleans at speed of 1 / [john_time] per hour and his friend at 1 / [friend], both together need [answer_a] hours.",
 			variable);
 
-		Catalog.GetPluralString ("John needs [john_time] hour to clean a warehouse and his friend half of the time. How many hours would take them to clean up the warehouse if they work together? [option_answers]",
-			"John needs [john_time] hours to clean a warehouse and his friend half of the time. How many hours would take them to clean up the warehouse if they work together? [option_answers]",
+		Catalog.GetPluralString ("John needs [john_time] hour to clean a warehouse and his friend half of John's time. How many hours would take them to clean up the warehouse if they work together? [option_answers]",
+			"John needs [john_time] hours to clean a warehouse and his friend half of John's time. How many hours would take them to clean up the warehouse if they work together? [option_answers]",
 			variable);
 
 		Catalog.GetPluralString ("John needs [john_time] hour to clean a warehouse and his friend two times John's time. How many hours would take them to clean up the warehouse if they work together? [option_answers]",



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