[gbrainy/difficulty] Remove difficulty in games
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy/difficulty] Remove difficulty in games
- Date: Sat, 3 Sep 2022 18:03:46 +0000 (UTC)
commit 2985765fcfa2714cf2aa980144b68231079e9833
Author: Jordi Mas <jmas softcatala org>
Date: Sat Sep 3 19:39:39 2022 +0200
Remove difficulty in games
src/Games/Calculation/CalculationArithmetical.cs | 17 +-----
src/Games/Calculation/CalculationAverage.cs | 22 ++------
src/Games/Calculation/CalculationCloserFraction.cs | 18 +------
src/Games/Calculation/CalculationConsecutiveSum.cs | 12 +----
src/Games/Calculation/CalculationFractions.cs | 22 ++------
.../Calculation/CalculationGreatestDivisor.cs | 17 +-----
src/Games/Calculation/CalculationPrimes.cs | 18 +------
src/Games/Calculation/CalculationProportions.cs | 14 +----
src/Games/Calculation/CalculationRatio.cs | 16 +-----
.../Calculation/CalculationSelectedNumbers.cs | 12 +----
src/Games/Calculation/CalculationTwoNumbers.cs | 14 +----
src/Games/Logic/Puzzle3DCube.cs | 15 +-----
src/Games/Logic/PuzzleBuildTriangle.cs | 14 +----
src/Games/Logic/PuzzleCountCircles.cs | 14 +----
src/Games/Logic/PuzzleDivideCircle.cs | 5 +-
src/Games/Logic/PuzzleFindTheNumber.cs | 16 +-----
src/Games/Logic/PuzzleFourSided.cs | 6 +--
src/Games/Logic/PuzzleHandshakes.cs | 14 +----
src/Games/Logic/PuzzleLines.cs | 5 +-
src/Games/Logic/PuzzleMostInCommon.cs | 63 ++++++----------------
src/Games/Logic/PuzzleNumericRelation.cs | 10 +---
src/Games/Logic/PuzzleNumericSequence.cs | 2 +-
src/Games/Logic/PuzzleSquares.cs | 6 +--
src/Games/Logic/PuzzleTriangles.cs | 5 +-
src/Games/Memory/MemoryColouredFigures.cs | 14 +----
src/Games/Memory/MemoryColouredText.cs | 14 +----
src/Games/Memory/MemoryCountDots.cs | 13 +----
src/Games/Memory/MemoryFaces.cs | 15 +-----
src/Games/Memory/MemoryFacts.cs | 15 +-----
src/Games/Memory/MemoryFiguresAndText.cs | 19 ++-----
src/Games/Memory/MemoryFiguresNumbers.cs | 13 +----
src/Games/Memory/MemoryIndications.cs | 39 +++++---------
src/Games/Memory/MemoryNumbers.cs | 16 +-----
src/Games/Memory/MemoryWords.cs | 13 +----
34 files changed, 74 insertions(+), 454 deletions(-)
---
diff --git a/src/Games/Calculation/CalculationArithmetical.cs
b/src/Games/Calculation/CalculationArithmetical.cs
index 6ce40514..2063e148 100644
--- a/src/Games/Calculation/CalculationArithmetical.cs
+++ b/src/Games/Calculation/CalculationArithmetical.cs
@@ -51,21 +51,8 @@ namespace gbrainy.Games.Calculation
{
int result = 0, operations = 0;
operation = (Operation) random.Next ((int) Operation.LastOperation);
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- max_operations = 2;
- max_operand = 50;
- break;
- case GameDifficulty.Medium:
- max_operations = 3;
- max_operand = 100;
- break;
- case GameDifficulty.Master:
- max_operations = 4;
- max_operand = 500;
- break;
- }
+ max_operations = 3;
+ max_operand = 100;
switch (operation) {
case Operation.Addition:
diff --git a/src/Games/Calculation/CalculationAverage.cs b/src/Games/Calculation/CalculationAverage.cs
index 027746b4..87ffae48 100644
--- a/src/Games/Calculation/CalculationAverage.cs
+++ b/src/Games/Calculation/CalculationAverage.cs
@@ -71,25 +71,9 @@ namespace gbrainy.Games.Calculation
int nums, options_next, dist, num_size, which = 0;
Answer.CheckAttributes |= GameAnswerCheckAttributes.MultiOption;
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- nums = 3;
- dist = nums * 3;
- num_size = 50;
- break;
- default:
- case GameDifficulty.Medium:
- nums = 5;
- dist = nums * 3;
- num_size = 150;
- break;
- case GameDifficulty.Master:
- nums = 7;
- dist = nums * 3;
- num_size = 500;
- break;
- }
-
+ nums = 5;
+ dist = nums * 3;
+ num_size = 150;
numbers = new double [nums];
options = new double [options_cnt];
diff --git a/src/Games/Calculation/CalculationCloserFraction.cs
b/src/Games/Calculation/CalculationCloserFraction.cs
index 2f30f1e9..ab217dc7 100644
--- a/src/Games/Calculation/CalculationCloserFraction.cs
+++ b/src/Games/Calculation/CalculationCloserFraction.cs
@@ -62,22 +62,8 @@ namespace gbrainy.Games.Calculation
bool duplicated;
bool done = false;
int i, ans_idx, basenum, randnum;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- basenum = 5;
- randnum = 10;
- break;
- default:
- case GameDifficulty.Medium:
- basenum = 5;
- randnum = 30;
- break;
- case GameDifficulty.Master:
- basenum = 9;
- randnum = 60;
- break;
- }
+ basenum = 5;
+ randnum = 30;
while (done == false) {
duplicated = false;
diff --git a/src/Games/Calculation/CalculationConsecutiveSum.cs
b/src/Games/Calculation/CalculationConsecutiveSum.cs
index 8987f3ba..cc8405ad 100644
--- a/src/Games/Calculation/CalculationConsecutiveSum.cs
+++ b/src/Games/Calculation/CalculationConsecutiveSum.cs
@@ -66,17 +66,7 @@ namespace gbrainy.Games.Calculation
protected override void Initialize ()
{
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- case GameDifficulty.Medium:
- total_size = 15;
- break;
- case GameDifficulty.Master:
- total_size = 20;
- break;
- }
-
+ total_size = 15;
numbers = new int [total_size];
do
diff --git a/src/Games/Calculation/CalculationFractions.cs b/src/Games/Calculation/CalculationFractions.cs
index d3f8a1a1..cd31535f 100644
--- a/src/Games/Calculation/CalculationFractions.cs
+++ b/src/Games/Calculation/CalculationFractions.cs
@@ -87,25 +87,9 @@ namespace gbrainy.Games.Calculation
{
double rslt = 0;
int factor = Factor;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- fractions_num = 2;
- demominator_max = 3;
- factor_max = 2;
- break;
- default:
- case GameDifficulty.Medium:
- fractions_num = 4;
- demominator_max = 3;
- factor_max = 3;
- break;
- case GameDifficulty.Master:
- fractions_num = 4;
- demominator_max = 5;
- factor_max = 4;
- break;
- }
+ fractions_num = 4;
+ demominator_max = 3;
+ factor_max = 3;
fractions = new FormulaFraction [fractions_num];
for (int i = 0; i < fractions_num; i++)
diff --git a/src/Games/Calculation/CalculationGreatestDivisor.cs
b/src/Games/Calculation/CalculationGreatestDivisor.cs
index adee6ca3..429d596b 100644
--- a/src/Games/Calculation/CalculationGreatestDivisor.cs
+++ b/src/Games/Calculation/CalculationGreatestDivisor.cs
@@ -52,21 +52,8 @@ namespace gbrainy.Games.Calculation
int []mult = new int [3];
Answer.CheckAttributes |= GameAnswerCheckAttributes.MultiOption;
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- max_num = 999;
- num_answ_ques = 3;
- break;
- case GameDifficulty.Medium:
- max_num = 999;
- num_answ_ques = 4;
- break;
- case GameDifficulty.Master:
- max_num = 9999;
- num_answ_ques = 4;
- break;
- }
-
+ max_num = 999;
+ num_answ_ques = 4;
numbers = new int [num_answ_ques];
answers = new int [num_answ_ques];
diff --git a/src/Games/Calculation/CalculationPrimes.cs b/src/Games/Calculation/CalculationPrimes.cs
index d67c10c6..25f0ee00 100644
--- a/src/Games/Calculation/CalculationPrimes.cs
+++ b/src/Games/Calculation/CalculationPrimes.cs
@@ -88,22 +88,8 @@ namespace gbrainy.Games.Calculation
protected override void Initialize ()
{
Answer.CheckAttributes |= GameAnswerCheckAttributes.MultiOption;
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- div3 = true;
- max_primeidx = 55; // 263
- break;
- case GameDifficulty.Master:
- div3 = false;
- max_primeidx = total_primes;
- break;
- case GameDifficulty.Medium:
- default:
- div3 = true;
- max_primeidx = 95; // 503
- break;
- }
-
+ div3 = true;
+ max_primeidx = 95; // 503
numbers = new int [total_nums];
for (int i = 0; i < numbers.Length; i++)
diff --git a/src/Games/Calculation/CalculationProportions.cs b/src/Games/Calculation/CalculationProportions.cs
index bd7f4aef..0a695609 100644
--- a/src/Games/Calculation/CalculationProportions.cs
+++ b/src/Games/Calculation/CalculationProportions.cs
@@ -50,19 +50,7 @@ namespace gbrainy.Games.Calculation
int options_next, random_max, which = 0;
Answer.CheckAttributes |= GameAnswerCheckAttributes.MultiOption;
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- random_max = 30;
- break;
- default:
- case GameDifficulty.Medium:
- random_max = 50;
- break;
- case GameDifficulty.Master:
- random_max = 80;
- break;
- }
-
+ random_max = 50;
do {
// Fraction
num = 10 + random.Next (random_max);
diff --git a/src/Games/Calculation/CalculationRatio.cs b/src/Games/Calculation/CalculationRatio.cs
index 22840a2b..7ba382b5 100644
--- a/src/Games/Calculation/CalculationRatio.cs
+++ b/src/Games/Calculation/CalculationRatio.cs
@@ -54,21 +54,7 @@ namespace gbrainy.Games.Calculation
protected override void Initialize ()
{
- int random_max;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- random_max = 5;
- break;
- default:
- case GameDifficulty.Medium:
- random_max = 8;
- break;
- case GameDifficulty.Master:
- random_max = 15;
- break;
- }
-
+ int random_max= 8;
number_a = 10 + random.Next (random_max);
if (number_a % 2 !=0)
diff --git a/src/Games/Calculation/CalculationSelectedNumbers.cs
b/src/Games/Calculation/CalculationSelectedNumbers.cs
index b09ce595..a785b5b4 100644
--- a/src/Games/Calculation/CalculationSelectedNumbers.cs
+++ b/src/Games/Calculation/CalculationSelectedNumbers.cs
@@ -135,17 +135,7 @@ namespace gbrainy.Games.Calculation
int options_next, which = 0;
Answer.CheckAttributes |= GameAnswerCheckAttributes.MultiOption;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- total_size = 10;
- break;
- case GameDifficulty.Medium:
- case GameDifficulty.Master:
- total_size = 15;
- break;
- }
-
+ total_size = 15;
GetPuzzleNumbersAndAnswer();
options = new int [options_cnt];
diff --git a/src/Games/Calculation/CalculationTwoNumbers.cs b/src/Games/Calculation/CalculationTwoNumbers.cs
index ad98a11a..6b7c7547 100644
--- a/src/Games/Calculation/CalculationTwoNumbers.cs
+++ b/src/Games/Calculation/CalculationTwoNumbers.cs
@@ -59,19 +59,7 @@ namespace gbrainy.Games.Calculation
{
Answer.CheckAttributes |= GameAnswerCheckAttributes.MatchAll;
type = (SubGameTypes) random.Next ((int) SubGameTypes.Length);
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- max_operand = 8;
- break;
- case GameDifficulty.Medium:
- max_operand = 10;
- break;
- case GameDifficulty.Master:
- max_operand = 15;
- break;
- }
-
+ max_operand = 10;
number_a = 5 + random.Next (max_operand);
number_b = 3 + random.Next (max_operand);
diff --git a/src/Games/Logic/Puzzle3DCube.cs b/src/Games/Logic/Puzzle3DCube.cs
index a12f0afa..4ba882bf 100644
--- a/src/Games/Logic/Puzzle3DCube.cs
+++ b/src/Games/Logic/Puzzle3DCube.cs
@@ -40,20 +40,7 @@ namespace gbrainy.Games.Logic
protected override void Initialize ()
{
int ans, max_random;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- max_random = 1;
- break;
- case GameDifficulty.Master:
- max_random = 5;
- break;
- case GameDifficulty.Medium:
- default:
- max_random = 3;
- break;
- }
-
+ max_random = 3;
rows = columns = depth = 4 + random.Next (max_random);
ans = rows * columns * depth;
Answer.Correct = ans.ToString ();
diff --git a/src/Games/Logic/PuzzleBuildTriangle.cs b/src/Games/Logic/PuzzleBuildTriangle.cs
index b9eb34b4..d9452ea7 100644
--- a/src/Games/Logic/PuzzleBuildTriangle.cs
+++ b/src/Games/Logic/PuzzleBuildTriangle.cs
@@ -61,18 +61,8 @@ namespace gbrainy.Games.Logic
protected override void Initialize ()
{
Answer.CheckAttributes |= GameAnswerCheckAttributes.MatchAll |
GameAnswerCheckAttributes.MultiOption | GameAnswerCheckAttributes.IgnoreSpaces;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- total_figures = 6;
- space_figures = 0.26;
- break;
- case GameDifficulty.Medium:
- case GameDifficulty.Master:
- total_figures = 8;
- space_figures = 0.2;
- break;
- }
+ total_figures = 8;
+ space_figures = 0.2;
random_indices_answers = new ArrayListIndicesRandom (total_figures);
random_indices_answers.Initialize ();
diff --git a/src/Games/Logic/PuzzleCountCircles.cs b/src/Games/Logic/PuzzleCountCircles.cs
index 82cb047e..f0b677e9 100644
--- a/src/Games/Logic/PuzzleCountCircles.cs
+++ b/src/Games/Logic/PuzzleCountCircles.cs
@@ -55,19 +55,7 @@ namespace gbrainy.Games.Logic
{
double x, y, rad;
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- n_circles = 7;
- break;
- case GameDifficulty.Master:
- n_circles = 14;
- break;
- case GameDifficulty.Medium:
- default:
- n_circles = 10;
- break;
- }
-
+ n_circles = 10;
n_circles += random.Next (5);
circles = new ItemCircle [n_circles];
for (int i = 0; i < circles.Length; i++)
diff --git a/src/Games/Logic/PuzzleDivideCircle.cs b/src/Games/Logic/PuzzleDivideCircle.cs
index 47a1edb2..779b165c 100644
--- a/src/Games/Logic/PuzzleDivideCircle.cs
+++ b/src/Games/Logic/PuzzleDivideCircle.cs
@@ -49,10 +49,7 @@ namespace gbrainy.Games.Logic
protected override void Initialize ()
{
- if (CurrentDifficulty==GameDifficulty.Easy)
- dots = 5;
- else
- dots = 5 + random.Next (2);
+ dots = 5 + random.Next (2);
switch (dots) {
case 5:
diff --git a/src/Games/Logic/PuzzleFindTheNumber.cs b/src/Games/Logic/PuzzleFindTheNumber.cs
index 27593171..95f9359c 100644
--- a/src/Games/Logic/PuzzleFindTheNumber.cs
+++ b/src/Games/Logic/PuzzleFindTheNumber.cs
@@ -164,23 +164,9 @@ namespace gbrainy.Games.Logic
return true;
}
- void SetGridSizeForDifficulty ()
- {
- switch (CurrentDifficulty) {
- case GameDifficulty.Master:
- rows = columns = 8;
- break;
- case GameDifficulty.Easy:
- case GameDifficulty.Medium:
- default:
- rows = columns = 6;
- break;
- }
- }
-
protected override void Initialize ()
{
- SetGridSizeForDifficulty ();
+ rows = columns = 6;
grid = new int [rows * columns];
do
diff --git a/src/Games/Logic/PuzzleFourSided.cs b/src/Games/Logic/PuzzleFourSided.cs
index 0d43e3e1..b3eb6f34 100644
--- a/src/Games/Logic/PuzzleFourSided.cs
+++ b/src/Games/Logic/PuzzleFourSided.cs
@@ -48,11 +48,7 @@ namespace gbrainy.Games.Logic
protected override void Initialize ()
{
- if (CurrentDifficulty==GameDifficulty.Easy)
- type = 0;
- else
- type = random.Next (2);
-
+ type = random.Next (2);
if (type == 0)
Answer.Correct = "13";
diff --git a/src/Games/Logic/PuzzleHandshakes.cs b/src/Games/Logic/PuzzleHandshakes.cs
index c9a32bbf..733fb2b7 100644
--- a/src/Games/Logic/PuzzleHandshakes.cs
+++ b/src/Games/Logic/PuzzleHandshakes.cs
@@ -46,19 +46,7 @@ namespace gbrainy.Games.Logic
protected override void Initialize ()
{
handshakes = 0;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- people = 4 + random.Next (4);
- break;
- case GameDifficulty.Master:
- people = 5 + random.Next (8);
- break;
- case GameDifficulty.Medium:
- default:
- people = 5 + random.Next (4);
- break;
- }
+ people = 5 + random.Next (4);
for (int i = 1; i < people; i++)
handshakes += i;
diff --git a/src/Games/Logic/PuzzleLines.cs b/src/Games/Logic/PuzzleLines.cs
index 896a5bd4..9c62d962 100644
--- a/src/Games/Logic/PuzzleLines.cs
+++ b/src/Games/Logic/PuzzleLines.cs
@@ -52,10 +52,7 @@ namespace gbrainy.Games.Logic
protected override void Initialize ()
{
- if (CurrentDifficulty==GameDifficulty.Easy)
- type = 0;
- else
- type = random.Next (max_types);
+ type = random.Next (max_types);
switch (type) {
case 0:
diff --git a/src/Games/Logic/PuzzleMostInCommon.cs b/src/Games/Logic/PuzzleMostInCommon.cs
index a6672c1a..4d69310e 100644
--- a/src/Games/Logic/PuzzleMostInCommon.cs
+++ b/src/Games/Logic/PuzzleMostInCommon.cs
@@ -87,10 +87,7 @@ namespace gbrainy.Games.Logic
public override string Rationale {
get {
- if (CurrentDifficulty == GameDifficulty.Easy)
- return Translations.GetString ("It has the same number of elements
inside the figure as the given figures.");
- else
- return Translations.GetString ("It is the figure with the most
elements in common compared to the given figures.");
+ return Translations.GetString ("It is the figure with the most elements in
common compared to the given figures.");
}
}
@@ -121,56 +118,28 @@ namespace gbrainy.Games.Logic
}
}
- if (CurrentDifficulty == GameDifficulty.Easy) {
- // Answer 1 (good)
- array.AddRange (new Element [] {Element.SmallCircle, Element.SmallCircle,
Element.SmallCircle,
+ // Answer 1 (good)
+ array.AddRange (new Element [] {Element.SmallCircle, Element.SmallCircle,
Element.MediumCircleWithChild,
Element.MediumCircle,Element.MediumCircle, Element.MediumCircleWithChild,
Element.MediumCircleWithChild});
- answers.Add (BuildFigure (array, answers));
+ answers.Add (BuildFigure (array, answers));
- // Answer 2
- array.Clear ();
- array.AddRange (new Element [] {Element.SmallCircle, Element.SmallCircle,
Element.MediumCircle,
+ // Answer 2
+ array.Clear ();
+ array.AddRange (new Element [] {Element.SmallCircle, Element.MediumCircle,
Element.MediumCircle,
Element.MediumCircle,Element.MediumCircle, Element.MediumCircleWithChild,
Element.MediumCircleWithChild});
- answers.Add (BuildFigure (array, answers));
+ answers.Add (BuildFigure (array, answers));
- // Answer 3
- array.Clear ();
- array.AddRange (new Element [] {Element.SmallCircle, Element.SmallCircle,
Element.MediumCircle,
+ // Answer 3
+ array.Clear ();
+ array.AddRange (new Element [] {Element.SmallCircle, Element.MediumCircleWithChild,
Element.MediumCircleWithChild,
Element.MediumCircle,Element.MediumCircle, Element.MediumCircleWithChild,
Element.MediumCircleWithChild});
- answers.Add (BuildFigure (array, answers));
+ answers.Add (BuildFigure (array, answers));
- // Answer 4
- array.Clear ();
- array.AddRange (new Element [] {Element.SmallCircle, Element.SmallCircle,
Element.MediumCircle,
+ // Answer 4
+ array.Clear ();
+ array.AddRange (new Element [] {Element.MediumCircle, Element.MediumCircleWithChild,
Element.MediumCircleWithChild,
Element.MediumCircle,Element.MediumCircle, Element.MediumCircleWithChild,
Element.MediumCircleWithChild});
- answers.Add (BuildFigure (array, answers));
- }
- else // Medium or Master
- {
-
- // Answer 1 (good)
- array.AddRange (new Element [] {Element.SmallCircle, Element.SmallCircle,
Element.MediumCircleWithChild,
- Element.MediumCircle,Element.MediumCircle,
Element.MediumCircleWithChild, Element.MediumCircleWithChild});
- answers.Add (BuildFigure (array, answers));
-
- // Answer 2
- array.Clear ();
- array.AddRange (new Element [] {Element.SmallCircle, Element.MediumCircle,
Element.MediumCircle,
- Element.MediumCircle,Element.MediumCircle,
Element.MediumCircleWithChild, Element.MediumCircleWithChild});
- answers.Add (BuildFigure (array, answers));
-
- // Answer 3
- array.Clear ();
- array.AddRange (new Element [] {Element.SmallCircle,
Element.MediumCircleWithChild, Element.MediumCircleWithChild,
- Element.MediumCircle,Element.MediumCircle,
Element.MediumCircleWithChild, Element.MediumCircleWithChild});
- answers.Add (BuildFigure (array, answers));
-
- // Answer 4
- array.Clear ();
- array.AddRange (new Element [] {Element.MediumCircle,
Element.MediumCircleWithChild, Element.MediumCircleWithChild,
- Element.MediumCircle,Element.MediumCircle,
Element.MediumCircleWithChild, Element.MediumCircleWithChild});
- answers.Add (BuildFigure (array, answers));
- }
+ answers.Add (BuildFigure (array, answers));
double figure_size = 0.22;
double x = DrawAreaX - 0.05, y = DrawAreaY + 0.45;
diff --git a/src/Games/Logic/PuzzleNumericRelation.cs b/src/Games/Logic/PuzzleNumericRelation.cs
index e760a52b..c25815d4 100644
--- a/src/Games/Logic/PuzzleNumericRelation.cs
+++ b/src/Games/Logic/PuzzleNumericRelation.cs
@@ -73,14 +73,8 @@ namespace gbrainy.Games.Logic
bool validate = false;
int group = 0, inc;
- if (CurrentDifficulty == GameDifficulty.Easy) {
- sum_value = 10 + random.Next (10);
- inc = 5;
- }
- else {
- sum_value = 30 + random.Next (10);
- inc = 12;
- }
+ sum_value = 30 + random.Next (10);
+ inc = 12;
while (validate == false)
{
diff --git a/src/Games/Logic/PuzzleNumericSequence.cs b/src/Games/Logic/PuzzleNumericSequence.cs
index 1dd07828..bb58b3bd 100644
--- a/src/Games/Logic/PuzzleNumericSequence.cs
+++ b/src/Games/Logic/PuzzleNumericSequence.cs
@@ -67,7 +67,7 @@ namespace gbrainy.Games.Logic
{
int[] seeds;
- formula = (Formula) random.Next (CurrentDifficulty == GameDifficulty.Easy ? 2 : 3);
+ formula = (Formula) random.Next (3);
numbers = new int [max_num];
switch (formula) {
diff --git a/src/Games/Logic/PuzzleSquares.cs b/src/Games/Logic/PuzzleSquares.cs
index 09103411..fc3ec27c 100644
--- a/src/Games/Logic/PuzzleSquares.cs
+++ b/src/Games/Logic/PuzzleSquares.cs
@@ -51,11 +51,7 @@ namespace gbrainy.Games.Logic
protected override void Initialize ()
{
- if (CurrentDifficulty==GameDifficulty.Easy)
- type = 0;
- else
- type = random.Next (2);
-
+ type = random.Next (2);
rows = 3;
columns = 3;
diff --git a/src/Games/Logic/PuzzleTriangles.cs b/src/Games/Logic/PuzzleTriangles.cs
index 86567992..2588fb65 100644
--- a/src/Games/Logic/PuzzleTriangles.cs
+++ b/src/Games/Logic/PuzzleTriangles.cs
@@ -47,10 +47,7 @@ namespace gbrainy.Games.Logic
protected override void Initialize ()
{
- if (CurrentDifficulty==GameDifficulty.Easy)
- type = 1;
- else
- type = random.Next (2);
+ type = random.Next (2);
if (type == 0)
Answer.Correct = "16";
diff --git a/src/Games/Memory/MemoryColouredFigures.cs b/src/Games/Memory/MemoryColouredFigures.cs
index 33321a52..6054083c 100644
--- a/src/Games/Memory/MemoryColouredFigures.cs
+++ b/src/Games/Memory/MemoryColouredFigures.cs
@@ -61,19 +61,7 @@ namespace gbrainy.Games.Memory
protected override void Initialize ()
{
Answer.CheckAttributes |= GameAnswerCheckAttributes.MultiOption |
GameAnswerCheckAttributes.IgnoreSpaces;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- columns = rows = 5;
- break;
- case GameDifficulty.Medium:
- columns = rows = 6;
- break;
- case GameDifficulty.Master:
- columns = rows = 7;
- break;
- }
-
+ columns = rows = 6;
squares = columns * rows;
rect_w = 0.3 / rows;
rect_h = 0.3 / columns;
diff --git a/src/Games/Memory/MemoryColouredText.cs b/src/Games/Memory/MemoryColouredText.cs
index b66dfa14..9e9730f3 100644
--- a/src/Games/Memory/MemoryColouredText.cs
+++ b/src/Games/Memory/MemoryColouredText.cs
@@ -45,19 +45,7 @@ namespace gbrainy.Games.Memory
protected override void Initialize ()
{
bool done = false;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- colors_shown = 3;
- break;
- case GameDifficulty.Medium:
- colors_shown = 4;
- break;
- case GameDifficulty.Master:
- colors_shown = 6;
- break;
- }
-
+ colors_shown = 4;
palette = new ColorPalette (Translations);
// It is not acceptable that all the random colors names match the right colors
diff --git a/src/Games/Memory/MemoryCountDots.cs b/src/Games/Memory/MemoryCountDots.cs
index a5968cfc..a7b52751 100644
--- a/src/Games/Memory/MemoryCountDots.cs
+++ b/src/Games/Memory/MemoryCountDots.cs
@@ -53,18 +53,7 @@ namespace gbrainy.Games.Memory
protected override void Initialize ()
{
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- maxdotscolor = 2;
- break;
- case GameDifficulty.Medium:
- maxdotscolor = 5;
- break;
- case GameDifficulty.Master:
- maxdotscolor = 8;
- break;
- }
-
+ maxdotscolor = 5;
location_order = new ArrayListIndicesRandom (NUMCOLUMNS*NUMCOLUMNS);
location_order.Initialize();
diff --git a/src/Games/Memory/MemoryFaces.cs b/src/Games/Memory/MemoryFaces.cs
index 1d050dfd..e1f400a1 100644
--- a/src/Games/Memory/MemoryFaces.cs
+++ b/src/Games/Memory/MemoryFaces.cs
@@ -63,19 +63,8 @@ namespace gbrainy.Games.Memory
{
int fig1, fig2;
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- case GameDifficulty.Medium:
- figures_active = 4;
- rows = columns = 3;
- break;
- case GameDifficulty.Master:
- figures_active = 6;
- rows = 3;
- columns = 4;
- break;
- }
-
+ figures_active = 4;
+ rows = columns = 3;
rect_w = 0.65 / columns;
rect_h = 0.65 / rows;
figures = new ArrayListIndicesRandom (figures_active * 2);
diff --git a/src/Games/Memory/MemoryFacts.cs b/src/Games/Memory/MemoryFacts.cs
index 70de6f4c..5421989a 100644
--- a/src/Games/Memory/MemoryFacts.cs
+++ b/src/Games/Memory/MemoryFacts.cs
@@ -54,20 +54,7 @@ namespace gbrainy.Games.Memory
{
int fact_idx, quest_idx, questions;
ArrayListIndicesRandom indices;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- questions = 1;
- break;
- default:
- case GameDifficulty.Medium:
- questions = 2;
- break;
- case GameDifficulty.Master:
- questions = 3;
- break;
- }
-
+ questions = 2;
indices = new ArrayListIndicesRandom (total_questions);
indices.Initialize ();
diff --git a/src/Games/Memory/MemoryFiguresAndText.cs b/src/Games/Memory/MemoryFiguresAndText.cs
index 3b766278..0793c897 100644
--- a/src/Games/Memory/MemoryFiguresAndText.cs
+++ b/src/Games/Memory/MemoryFiguresAndText.cs
@@ -87,22 +87,9 @@ namespace gbrainy.Games.Memory
protected override void Initialize ()
{
converter = new FigureTypeConverter (Translations);
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- case GameDifficulty.Medium:
- figures_active = 6;
- rows = 2;
- columns = 3;
- break;
- case GameDifficulty.Master:
- figures_active = 9;
- columns = rows = 3;
- break;
- default:
- throw new InvalidOperationException ();
- }
-
+ figures_active = 6;
+ rows = 2;
+ columns = 3;
rect_w = 0.65 / columns;
rect_h = 0.65 / rows;
question_pos = random.Next (figures_active);
diff --git a/src/Games/Memory/MemoryFiguresNumbers.cs b/src/Games/Memory/MemoryFiguresNumbers.cs
index cdf5af20..ec21b095 100644
--- a/src/Games/Memory/MemoryFiguresNumbers.cs
+++ b/src/Games/Memory/MemoryFiguresNumbers.cs
@@ -45,18 +45,7 @@ namespace gbrainy.Games.Memory
protected override void Initialize ()
{
Answer.CheckAttributes |= GameAnswerCheckAttributes.MultiOption |
GameAnswerCheckAttributes.IgnoreSpaces;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- columns = rows = 2;
- break;
- case GameDifficulty.Medium:
- columns = rows = 3;
- break;
- case GameDifficulty.Master:
- columns = rows = 4;
- break;
- }
+ columns = rows = 3;
rect_w = 0.3 / rows;
rect_h = 0.3 / columns;
diff --git a/src/Games/Memory/MemoryIndications.cs b/src/Games/Memory/MemoryIndications.cs
index d9ace911..d0cf1d22 100644
--- a/src/Games/Memory/MemoryIndications.cs
+++ b/src/Games/Memory/MemoryIndications.cs
@@ -169,7 +169,7 @@ namespace gbrainy.Games.Memory
protected override void Initialize ()
{
- indications = new Indication [CurrentDifficulty == GameDifficulty.Easy ? 5 : 7];
+ indications = new Indication [7];
Indication.TurnDirection second_turn = (Indication.TurnDirection) 2 + random.Next
(2);
indications[0] = new Indication (Translations, Indication.Type.Start, 0);
@@ -179,18 +179,14 @@ namespace gbrainy.Games.Memory
Answer.CheckAttributes |= GameAnswerCheckAttributes.MultiOption |
GameAnswerCheckAttributes.IgnoreSpaces;
- if (CurrentDifficulty==GameDifficulty.Easy) {
- indications[4] = new Indication (Translations, Indication.Type.End, 1);
- } else {
- if (second_turn == Indication.TurnDirection.Up)
- indications[4] = new Indication (Translations, Indication.Type.Turn,
Indication.TurnDirection.Up);
- else
- indications[4] = new Indication (Translations, Indication.Type.Turn,
Indication.TurnDirection.Down);
+ if (second_turn == Indication.TurnDirection.Up)
+ indications[4] = new Indication (Translations, Indication.Type.Turn,
Indication.TurnDirection.Up);
+ else
+ indications[4] = new Indication (Translations, Indication.Type.Turn,
Indication.TurnDirection.Down);
+
+ indications[5] = new Indication (Translations, Indication.Type.Turn, random.Next
(2)); // right or left
+ indications[6] = new Indication (Translations, Indication.Type.End, 1);
- indications[5] = new Indication (Translations, Indication.Type.Turn,
random.Next (2)); // right or left
- indications[6] = new Indication (Translations, Indication.Type.End, 1);
- }
-
indications_wrongA = CopyAnswer ();
indications_wrongB = CopyAnswer ();
indications_wrongC = CopyAnswer ();
@@ -202,20 +198,11 @@ namespace gbrainy.Games.Memory
indications_wrongA[3] = new Indication (Translations, Indication.Type.Turn,
Indication.TurnDirection.Right);
}
- if (CurrentDifficulty == GameDifficulty.Easy) {
- if ((Indication.TurnDirection) indications[2].obj ==
Indication.TurnDirection.Up) {
- indications_wrongB[2] = new Indication (Translations,
Indication.Type.Turn, Indication.TurnDirection.Down);
- }
- else {
- indications_wrongB[2] = new Indication (Translations,
Indication.Type.Turn, Indication.TurnDirection.Up);
- }
- } else {
- if ((Indication.TurnDirection) indications[5].obj ==
Indication.TurnDirection.Right) {
- indications_wrongB[5] = new Indication (Translations,
Indication.Type.Turn, Indication.TurnDirection.Left);
- }
- else {
- indications_wrongB[5] = new Indication (Translations,
Indication.Type.Turn, Indication.TurnDirection.Right);
- }
+ if ((Indication.TurnDirection) indications[5].obj == Indication.TurnDirection.Right) {
+ indications_wrongB[5] = new Indication (Translations, Indication.Type.Turn,
Indication.TurnDirection.Left);
+ }
+ else {
+ indications_wrongB[5] = new Indication (Translations, Indication.Type.Turn,
Indication.TurnDirection.Right);
}
if ((Indication.TurnDirection) indications[1].obj == Indication.TurnDirection.Right) {
diff --git a/src/Games/Memory/MemoryNumbers.cs b/src/Games/Memory/MemoryNumbers.cs
index 485fbe65..68aa1351 100644
--- a/src/Games/Memory/MemoryNumbers.cs
+++ b/src/Games/Memory/MemoryNumbers.cs
@@ -137,21 +137,7 @@ namespace gbrainy.Games.Memory
protected override void Initialize ()
{
base.Initialize ();
- int total;
-
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- total = 5;
- break;
- case GameDifficulty.Medium:
- default:
- total = 7;
- break;
- case GameDifficulty.Master:
- total = 9;
- break;
- }
-
+ int total= 7;
int[] nums = new int [total];
for (int i = 0; i < nums.Length; i++)
diff --git a/src/Games/Memory/MemoryWords.cs b/src/Games/Memory/MemoryWords.cs
index c8e1b745..ad6301ed 100644
--- a/src/Games/Memory/MemoryWords.cs
+++ b/src/Games/Memory/MemoryWords.cs
@@ -92,18 +92,7 @@ namespace gbrainy.Games.Memory
words.Add (Translations.GetString ("bear"));
words.Add (Translations.GetString ("wolf"));
- switch (CurrentDifficulty) {
- case GameDifficulty.Easy:
- showed = 6;
- break;
- case GameDifficulty.Medium:
- showed = 9;
- break;
- case GameDifficulty.Master:
- showed = 12;
- break;
- }
-
+ showed = 9;
words_order = new ArrayListIndicesRandom (total_words);
words_order.Initialize ();
answer = random.Next (showed);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
