[Tux4kids-commits] r773 - in tuxmath/trunk/data/missions/campaign: ace cadet commando ranger scout

[tholy-guest at alioth.debian.org]

Author: tholy-guest
Date: 2008-11-30 15:28:47 +0000 (Sun, 30 Nov 2008)
New Revision: 773

Modified:
   tuxmath/trunk/data/missions/campaign/ace/round1
   tuxmath/trunk/data/missions/campaign/ace/round2
   tuxmath/trunk/data/missions/campaign/ace/round3
   tuxmath/trunk/data/missions/campaign/cadet/round1
   tuxmath/trunk/data/missions/campaign/cadet/round2
   tuxmath/trunk/data/missions/campaign/cadet/round3
   tuxmath/trunk/data/missions/campaign/commando/round1
   tuxmath/trunk/data/missions/campaign/commando/round2
   tuxmath/trunk/data/missions/campaign/commando/round3
   tuxmath/trunk/data/missions/campaign/ranger/round1
   tuxmath/trunk/data/missions/campaign/ranger/round2
   tuxmath/trunk/data/missions/campaign/ranger/round3
   tuxmath/trunk/data/missions/campaign/scout/round1
   tuxmath/trunk/data/missions/campaign/scout/round2
Log:
Adjust settings for campaign mode.


Modified: tuxmath/trunk/data/missions/campaign/ace/round1
===================================================================
--- tuxmath/trunk/data/missions/campaign/ace/round1	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/ace/round1	2008-11-30 15:28:47 UTC (rev 773)
@@ -3,8 +3,9 @@
 addition_allowed = 0
 subtraction_allowed = 0
 multiplication_allowed = 0
-min_divisor = -10
+allow_negatives = 0
+min_divisor = 0
 max_divisor = 10
-min_quotient = -10
+min_quotient = 0
 max_quotient = 10
-avg_list_length = 150
+avg_list_length = 40

Modified: tuxmath/trunk/data/missions/campaign/ace/round2
===================================================================
--- tuxmath/trunk/data/missions/campaign/ace/round2	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/ace/round2	2008-11-30 15:28:47 UTC (rev 773)
@@ -3,12 +3,13 @@
 addition_allowed = 0
 subtraction_allowed = 0
 multiplication_allowed = 1
-min_divisor = -20
-max_divisor = 20
-min_quotient = -20
-max_quotient = 20
+allow_negatives = 1
+min_divisor = -12
+max_divisor = 12
+min_quotient = -12
+max_quotient = 12
 min_multiplier = -10
 max_multiplier = 10
 min_multiplicand = -10
 max_multiplicand = 10
-avg_list_length = 150
+avg_list_length = 70

Modified: tuxmath/trunk/data/missions/campaign/ace/round3
===================================================================
--- tuxmath/trunk/data/missions/campaign/ace/round3	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/ace/round3	2008-11-30 15:28:47 UTC (rev 773)
@@ -3,14 +3,15 @@
 addition_allowed = 1
 subtraction_allowed = 1
 multiplication_allowed = 1
-min_divisor = -20
-max_divisor = 20
-min_quotient = -20
-max_quotient = 20
-min_multiplier = -10
-max_multiplier = 10
-min_multiplicand = -10
-max_multiplicand = 10
+allow_negatives = 1
+min_divisor = -12
+max_divisor = 12
+min_quotient = -12
+max_quotient = 12
+min_multiplier = -12
+max_multiplier = 12
+min_multiplicand = -12
+max_multiplicand = 12
 min_addend = -10
 max_addend = 10
 min_augend = -10
@@ -19,4 +20,4 @@
 max_minuend = 10
 min_subtrahend = -10
 max_subtrahend = 10
-avg_list_length = 150
\ No newline at end of file
+avg_list_length = 100
\ No newline at end of file

Modified: tuxmath/trunk/data/missions/campaign/cadet/round1
===================================================================
--- tuxmath/trunk/data/missions/campaign/cadet/round1	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/cadet/round1	2008-11-30 15:28:47 UTC (rev 773)
@@ -4,4 +4,4 @@
 addition_allowed = 0
 min_typing_num = 0
 max_typing_num = 20
-avg_list_length = 0
+avg_list_length = 10

Modified: tuxmath/trunk/data/missions/campaign/cadet/round2
===================================================================
--- tuxmath/trunk/data/missions/campaign/cadet/round2	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/cadet/round2	2008-11-30 15:28:47 UTC (rev 773)
@@ -1,8 +1,9 @@
 #cadet round 2
 
 typing_practice_allowed = 0
+addition_allowed = 1
 min_augend = 0
 max_augend = 10
-min_augend = 0
-min_augend = 10
+min_addend = 0
+max_addend = 10
 avg_list_length = 30

Modified: tuxmath/trunk/data/missions/campaign/cadet/round3
===================================================================
--- tuxmath/trunk/data/missions/campaign/cadet/round3	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/cadet/round3	2008-11-30 15:28:47 UTC (rev 773)
@@ -3,6 +3,6 @@
 typing_practice_allowed = 0
 min_augend = 0
 max_augend = 20
-min_augend = 0
-min_augend = 20
+min_addend = 0
+max_addend = 20
 avg_list_length = 50

Modified: tuxmath/trunk/data/missions/campaign/commando/round1
===================================================================
--- tuxmath/trunk/data/missions/campaign/commando/round1	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/commando/round1	2008-11-30 15:28:47 UTC (rev 773)
@@ -17,4 +17,4 @@
 max_minuend = 20
 min_subtrahend = -20
 max_subtrahend = 20
-avg_list_length = 150
+avg_list_length = 40

Modified: tuxmath/trunk/data/missions/campaign/commando/round2
===================================================================
--- tuxmath/trunk/data/missions/campaign/commando/round2	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/commando/round2	2008-11-30 15:28:47 UTC (rev 773)
@@ -1,20 +1,21 @@
 #commando round 2
 
-max_formula_nums = 5
-min_multiplier = -10
+max_formula_nums = 3
+allow_negatives = 0
+min_multiplier = 0
 max_multiplier = 10
-min_multiplicand = -10
+min_multiplicand = 0
 max_multiplicand = 10
-min_divisor = -10
+min_divisor = 0
 max_divisor = 10
-min_quotient = -10
+min_quotient = 0
 max_quotient = 10
-min_addend = -10
+min_addend = 0
 max_addend = 10
-min_augend = -10
+min_augend = 0
 max_augend = 10
-min_minuend = -10
+min_minuend = 0
 max_minuend = 10
-min_subtrahend = -10
+min_subtrahend = 0
 max_subtrahend = 10
-avg_list_length = 80
+avg_list_length = 70

Modified: tuxmath/trunk/data/missions/campaign/commando/round3
===================================================================
--- tuxmath/trunk/data/missions/campaign/commando/round3	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/commando/round3	2008-11-30 15:28:47 UTC (rev 773)
@@ -1,15 +1,16 @@
 #commando round 3
 
-max_formula_nums = 5
+max_formula_nums = 3
+allow_negatives = 1
 typing_practice_allowed = 1
-min_multiplier = -20
-max_multiplier = 20
-min_multiplicand = -20
-max_multiplicand = 20
-min_divisor = -20
-max_divisor = 20
-min_quotient = -20
-max_quotient = 20
+min_multiplier = -12
+max_multiplier = 12
+min_multiplicand = -12
+max_multiplicand = 12
+min_divisor = -12
+max_divisor = 12
+min_quotient = -12
+max_quotient = 12
 min_addend = -20
 max_addend = 20
 min_augend = -20
@@ -18,4 +19,4 @@
 max_minuend = 20
 min_subtrahend = -20
 max_subtrahend = 20
-avg_list_length = 40
+avg_list_length = 100

Modified: tuxmath/trunk/data/missions/campaign/ranger/round1
===================================================================
--- tuxmath/trunk/data/missions/campaign/ranger/round1	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/ranger/round1	2008-11-30 15:28:47 UTC (rev 773)
@@ -7,4 +7,4 @@
 max_multiplier = 10
 min_multiplicand = 0
 max_multiplicand = 10
-avg_list_length = 110
+avg_list_length = 40

Modified: tuxmath/trunk/data/missions/campaign/ranger/round2
===================================================================
--- tuxmath/trunk/data/missions/campaign/ranger/round2	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/ranger/round2	2008-11-30 15:28:47 UTC (rev 773)
@@ -2,13 +2,13 @@
 
 addition_allowed = 1
 subtraction_allowed = 0
-allow_negatives = 1
-min_multiplier = -20
-max_multiplier = 20
-min_multiplicand = -20
-max_multiplicand = 20
-min_addend = -10
+allow_negatives = 0
+min_multiplier = 0
+max_multiplier = 12
+min_multiplicand = 0
+max_multiplicand = 12
+min_addend = 0
 max_addend = 10
-min_augend = -10
+min_augend = 0
 max_augend = 10
-avg_list_length = 130
+avg_list_length = 70

Modified: tuxmath/trunk/data/missions/campaign/ranger/round3
===================================================================
--- tuxmath/trunk/data/missions/campaign/ranger/round3	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/ranger/round3	2008-11-30 15:28:47 UTC (rev 773)
@@ -3,10 +3,10 @@
 addition_allowed = 1
 subtraction_allowed = 1
 allow_negatives = 1
-min_multiplier = -20
-max_multiplier = 20
-min_multiplicand = -20
-max_multiplicand = 20
+min_multiplier = -12
+max_multiplier = 12
+min_multiplicand = -12
+max_multiplicand = 12
 min_addend = -20
 max_addend = 20
 min_augend = -20
@@ -15,4 +15,4 @@
 max_minuend = 10
 min_subtrahend = -10
 max_subtrahend = 10
-avg_list_length = 150
\ No newline at end of file
+avg_list_length = 100
\ No newline at end of file

Modified: tuxmath/trunk/data/missions/campaign/scout/round1
===================================================================
--- tuxmath/trunk/data/missions/campaign/scout/round1	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/scout/round1	2008-11-30 15:28:47 UTC (rev 773)
@@ -5,4 +5,4 @@
 max_minuend = 10
 min_subtrahend = 0
 max_subtrahend = 10
-avg_list_length = 60
\ No newline at end of file
+avg_list_length = 40
\ No newline at end of file

Modified: tuxmath/trunk/data/missions/campaign/scout/round2
===================================================================
--- tuxmath/trunk/data/missions/campaign/scout/round2	2008-11-30 15:28:21 UTC (rev 772)
+++ tuxmath/trunk/data/missions/campaign/scout/round2	2008-11-30 15:28:47 UTC (rev 773)
@@ -5,4 +5,4 @@
 max_minuend = 20
 min_subtrahend = 0
 max_subtrahend = 20
-avg_list_length = 80
\ No newline at end of file
+avg_list_length = 70
\ No newline at end of file