[Tux4kids-commits] r811 - tuxmath/trunk/data/missions/lessons
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Tue Dec 16 22:30:12 UTC 2008
Author: dbruce-guest
Date: 2008-12-16 22:30:12 +0000 (Tue, 16 Dec 2008)
New Revision: 811
Added:
tuxmath/trunk/data/missions/lessons/lesson47.1
Modified:
tuxmath/trunk/data/missions/lessons/Makefile.am
tuxmath/trunk/data/missions/lessons/descr_lessons
tuxmath/trunk/data/missions/lessons/lesson24
tuxmath/trunk/data/missions/lessons/lesson25
tuxmath/trunk/data/missions/lessons/lesson26
tuxmath/trunk/data/missions/lessons/lesson27
tuxmath/trunk/data/missions/lessons/lesson28
tuxmath/trunk/data/missions/lessons/lesson29
tuxmath/trunk/data/missions/lessons/lesson30
tuxmath/trunk/data/missions/lessons/lesson31
tuxmath/trunk/data/missions/lessons/lesson32
tuxmath/trunk/data/missions/lessons/lesson33
tuxmath/trunk/data/missions/lessons/lesson34
tuxmath/trunk/data/missions/lessons/lesson35
tuxmath/trunk/data/missions/lessons/lesson36
tuxmath/trunk/data/missions/lessons/lesson37
tuxmath/trunk/data/missions/lessons/lesson38
tuxmath/trunk/data/missions/lessons/lesson39
tuxmath/trunk/data/missions/lessons/lesson40
tuxmath/trunk/data/missions/lessons/lesson41
tuxmath/trunk/data/missions/lessons/lesson42
tuxmath/trunk/data/missions/lessons/lesson43
tuxmath/trunk/data/missions/lessons/lesson44
tuxmath/trunk/data/missions/lessons/lesson45
tuxmath/trunk/data/missions/lessons/lesson46
tuxmath/trunk/data/missions/lessons/lesson47
tuxmath/trunk/data/missions/lessons/lesson48
tuxmath/trunk/data/missions/lessons/lesson49
tuxmath/trunk/data/missions/lessons/lesson50
tuxmath/trunk/data/missions/lessons/lesson51
tuxmath/trunk/data/missions/lessons/update-po.sh
Log:
lesson file fixes
Modified: tuxmath/trunk/data/missions/lessons/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/lessons/Makefile.am 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/Makefile.am 2008-12-16 22:30:12 UTC (rev 811)
@@ -52,7 +52,9 @@
lesson45 \
lesson46 \
lesson47 \
+ lesson47.1 \
lesson48 \
+ lesson48.1 \
lesson49 \
lesson50 \
lesson51 \
Modified: tuxmath/trunk/data/missions/lessons/descr_lessons
===================================================================
--- tuxmath/trunk/data/missions/lessons/descr_lessons 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/descr_lessons 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,31 +1,17 @@
_("Number Typing")
-_("Number Typing")
_("Addition: 1 to 3")
-_("Addition: 1 to 3")
_("Addition: 0 to 5")
-_("Addition: 0 to 5")
_("Addition: Sums to 10")
-_("Addition: Sums to 10")
_("Addition: Sums to 15")
-_("Addition: Sums to 15")
_("Addition: Sums to 20")
-_("Addition: Sums to 20")
_("Addition: Two Digit Numbers")
-_("Addition: Two Digit Numbers")
_("Addition: Missing Numbers")
-_("Addition: Missing Numbers")
_("Subtraction: 0 to 10")
_("Subtraction: 0 to 20")
-_("Subtraction: 0 to 20")
-_("Subtraction: 0 to 10")
_("Subtraction: Two Digit Numbers")
-_("Subtraction: Two Digit Numbers")
_("Addition and Subtraction Review")
-_("Addition and Subtraction Review")
_("Multiplication: 0 to 3")
-_("Multiplication: 0 to 3")
_("Multiples of 2")
-_("Multiples of 2")
_("Multiples of 3")
_("Multiples of 4")
_("Multiples of 5")
@@ -38,29 +24,55 @@
_("Multiples of 10")
_("Multiplication: 0 to 10")
_("Multiples of 11 and 12")
+_("Multiples of 11 and 12")
_("Multiplication: 0 to 12")
+_("Multiplication: 0 to 12")
_("Multiples of 13, 14, and 15")
+_("Multiples of 13, 14, and 15")
_("Multiplication: 0 to 15")
+_("Multiplication: 0 to 15")
_("Multiplication: Missing Numbers")
+_("Multiplication: Missing Numbers")
_("Division by 2")
+_("Division by 2")
_("Division by 3")
+_("Division by 3")
_("Division by 4")
+_("Division by 4")
_("Division by 5")
+_("Division by 5")
_("Division: 1 to 5")
+_("Division: 1 to 5")
_("Division by 6")
+_("Division by 6")
_("Division by 7")
+_("Division by 7")
_("Division by 8")
+_("Division by 8")
_("Division by 9")
+_("Division by 9")
_("Division by 10")
+_("Division by 10")
_("Division: 1 to 10")
+_("Division: 1 to 10")
_("Division by 11 and 12")
+_("Division by 11 and 12")
_("Division: 1 to 12")
+_("Division: 1 to 12")
_("Division by 13, 14, and 15")
+_("Division by 13, 14, and 15")
_("Division: 1 to 15")
+_("Division: 1 to 15")
_("Multiplication and Division Review")
+_("Multiplication and Division Review")
_("Typing Negative Numbers")
+_("Typing Negative Numbers")
_("Subtraction: Negative Answers")
+_("Subtraction: Negative Answers")
_("Adding Negatives to Positives")
+_("Adding Positives to Negatives")
+_("Adding Positives to Negatives")
+_("Adding Negatives to Positives")
_("Subtracting Negatives From Positives")
_("Adding Negatives to Negatives")
_("Subtracting Negatives From Negatives")
Modified: tuxmath/trunk/data/missions/lessons/lesson24
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson24 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson24 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,40 @@
# Multiples of 11 and 12
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 0
-typing_practice_allowed = 0
-allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 11
max_multiplier = 12
min_multiplicand = 0
max_multiplicand = 12
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 0
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
+format_answer_last = 1
format_mult_answer_last = 1
format_mult_answer_first = 0
format_mult_answer_middle = 0
-format_div_answer_last = 1
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 52
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson25
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson25 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson25 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,57 +1,39 @@
# Multiplication: 0 to 12
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 0
-typing_practice_allowed = 0
-allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 0
max_multiplier = 12
min_multiplicand = 0
max_multiplicand = 12
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 0
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
+format_answer_last = 1
format_mult_answer_last = 1
format_mult_answer_first = 0
format_mult_answer_middle = 0
-format_div_answer_last = 1
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 169
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
Modified: tuxmath/trunk/data/missions/lessons/lesson26
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson26 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson26 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,40 @@
# Multiples of 13, 14, and 15
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 0
-typing_practice_allowed = 0
-allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 13
max_multiplier = 15
min_multiplicand = 0
max_multiplicand = 15
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 0
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
+format_answer_last = 1
format_mult_answer_last = 1
format_mult_answer_first = 0
format_mult_answer_middle = 0
-format_div_answer_last = 1
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 96
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson27
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson27 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson27 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,57 +1,39 @@
# Multiplication: 0 to 15
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 0
-typing_practice_allowed = 0
-allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 0
max_multiplier = 15
min_multiplicand = 0
max_multiplicand = 15
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 0
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
+format_answer_last = 1
format_mult_answer_last = 1
format_mult_answer_first = 0
format_mult_answer_middle = 0
-format_div_answer_last = 1
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 256
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
Modified: tuxmath/trunk/data/missions/lessons/lesson28
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson28 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson28 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,4 +1,5 @@
# Multiplication: Missing Numbers
+
play_through_list = 1
allow_speedup = 1
use_feedback = 1
Modified: tuxmath/trunk/data/missions/lessons/lesson29
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson29 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson29 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 2
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 2
max_multiplier = 2
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 2
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 44
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson30
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson30 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson30 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 3
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 3
max_multiplier = 3
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 3
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 44
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson31
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson31 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson31 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 4
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 4
max_multiplier = 4
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 4
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 44
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson32
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson32 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson32 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 5
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 5
max_multiplier = 5
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 5
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 44
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson33
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson33 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson33 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,40 @@
# Division: 1 to 5
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 0
division_allowed = 1
-typing_practice_allowed = 0
-allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
-min_multiplier = 5
-max_multiplier = 5
-min_multiplicand = 0
-max_multiplicand = 10
min_divisor = 1
max_divisor = 5
min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 1
+max_quotient = 5
+format_answer_last = 1
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 90
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson34
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson34 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson34 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 6
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 6
max_multiplier = 6
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 6
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 44
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson35
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson35 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson35 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 7
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 7
max_multiplier = 7
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 7
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 44
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson36
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson36 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson36 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 8
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 8
max_multiplier = 8
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 8
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 44
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson37
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson37 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson37 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 9
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 9
max_multiplier = 9
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 9
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 44
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson38
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson38 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson38 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 10
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 10
max_multiplier = 10
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 10
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 44
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson39
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson39 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson39 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,40 @@
# Division: 1 to 10
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 0
division_allowed = 1
-typing_practice_allowed = 0
-allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
-min_multiplier = 5
-max_multiplier = 5
-min_multiplicand = 0
-max_multiplicand = 10
min_divisor = 1
max_divisor = 10
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_answer_last = 1
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 110
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson40
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson40 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson40 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 11 and 12
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 11
max_multiplier = 12
min_multiplicand = 0
@@ -23,37 +16,34 @@
min_divisor = 11
max_divisor = 12
min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+max_quotient = 12
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 52
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson41
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson41 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson41 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,40 @@
# Division: 1 to 12
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 0
division_allowed = 1
-typing_practice_allowed = 0
-allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
-min_multiplier = 5
-max_multiplier = 5
-min_multiplicand = 0
-max_multiplicand = 10
min_divisor = 1
max_divisor = 12
min_quotient = 0
max_quotient = 12
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_answer_last = 1
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 156
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson42
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson42 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson42 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Division by 13, 14, and 15
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 13
max_multiplier = 15
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 15
min_quotient = 0
max_quotient = 15
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
+format_answer_last = 1
+format_mult_answer_last = 1
format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_mult_answer_middle = 0
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 96
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson43
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson43 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson43 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,40 @@
# Division: 1 to 15
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 0
division_allowed = 1
-typing_practice_allowed = 0
-allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
-min_multiplier = 5
-max_multiplier = 5
-min_multiplicand = 0
-max_multiplicand = 10
min_divisor = 1
max_divisor = 15
min_quotient = 0
max_quotient = 15
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 1
+format_answer_last = 1
format_div_answer_last = 1
format_div_answer_first = 0
format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 240
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson44
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson44 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson44 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,21 +1,14 @@
# Multiplication and Division Review
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 1
division_allowed = 1
typing_practice_allowed = 0
allow_negatives = 0
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
-min_minuend = 0
-max_minuend = 20
-min_subtrahend = 0
-max_subtrahend = 10
min_multiplier = 0
max_multiplier = 10
min_multiplicand = 0
@@ -24,36 +17,33 @@
max_divisor = 10
min_quotient = 0
max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
+format_answer_last = 1
+format_mult_answer_last = 1
+format_mult_answer_first = 0
+format_mult_answer_middle = 0
+format_div_answer_last = 1
+format_div_answer_first = 0
+format_div_answer_middle = 0
+max_answer = 400
save_summary = 1
-question_copies = 1
repeat_wrongs = 1
copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 1
-format_mult_answer_first = 1
-format_mult_answer_middle = 1
-format_div_answer_last = 1
-format_div_answer_first = 1
-format_div_answer_middle = 1
-max_answer = 999
-max_questions = 5000
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 50
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson45
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson45 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson45 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,52 +1,29 @@
# Typing Negative Numbers
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 1
addition_allowed = 0
subtraction_allowed = 0
multiplication_allowed = 0
division_allowed = 0
allow_negatives = 1
-typing_practice_allowed = 1
-min_augend = 1
-max_augend = 3
-min_addend = 1
-max_addend = 3
-min_minuend = 0
-max_minuend = 10
-min_subtrahend = 0
-max_subtrahend = 10
-min_multiplier = 0
-max_multiplier = 10
-min_multiplicand = 0
-max_multiplicand = 10
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
min_typing_num = -20
max_typing_num = 0
+max_answer = 400
save_summary = 1
-question_copies = 1
repeat_wrongs = 1
copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
-format_sub_answer_last = 0
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 0
-format_div_answer_last = 0
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 400
-max_questions = 5000
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 20
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
Modified: tuxmath/trunk/data/missions/lessons/lesson46
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson46 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson46 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,41 @@
# Subtraction: Negative Answers
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 1
multiplication_allowed = 0
division_allowed = 0
-typing_practice_allowed = 0
-allow_negatives = 1
-min_augend = 0
-max_augend = 10
-min_addend = 0
-max_addend = 10
min_minuend = 0
max_minuend = 10
min_subtrahend = 0
max_subtrahend = 10
-min_multiplier = 0
-max_multiplier = 10
-min_multiplicand = 0
-max_multiplicand = 10
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 2
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 0
-format_add_answer_first = 0
-format_add_answer_middle = 0
+format_answer_last = 1
format_sub_answer_last = 1
format_sub_answer_first = 0
format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 0
-format_div_answer_last = 0
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+allow_negatives = 1
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 40
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson47
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson47 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson47 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,41 @@
# Adding Negatives to Positives
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 1
-subtraction_allowed = 1
+subtraction_allowed = 0
multiplication_allowed = 0
division_allowed = 0
-typing_practice_allowed = 0
allow_negatives = 1
min_augend = 0
max_augend = 10
min_addend = -10
max_addend = -1
-min_minuend = 0
-max_minuend = 10
-min_subtrahend = 0
-max_subtrahend = 10
-min_multiplier = 0
-max_multiplier = 10
-min_multiplicand = 0
-max_multiplicand = 10
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
+format_answer_last = 1
format_add_answer_last = 1
format_add_answer_first = 0
format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 0
-format_div_answer_last = 0
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 20
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 40
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Added: tuxmath/trunk/data/missions/lessons/lesson47.1
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson47.1 (rev 0)
+++ tuxmath/trunk/data/missions/lessons/lesson47.1 2008-12-16 22:30:12 UTC (rev 811)
@@ -0,0 +1,41 @@
+# Adding Positives to Negatives
+
+# Math options
+play_through_list = 1
+typing_practice_allowed = 0
+addition_allowed = 1
+subtraction_allowed = 0
+multiplication_allowed = 0
+division_allowed = 0
+allow_negatives = 1
+min_augend = -10
+max_augend = -1
+min_addend = 0
+max_addend = 10
+format_answer_last = 1
+format_add_answer_last = 1
+format_add_answer_first = 0
+format_add_answer_middle = 0
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
+randomize = 1
+comprehensive = 1
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 40
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
+starting_comets = 2
+extra_comets_per_wave = 2
+max_comets = 10
+speed = 1.00
+max_speed = 20.00
+danger_level = 0.35
+danger_level_speedup = 1
+danger_level_max = 0.90
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson48
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson48 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson48 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,41 @@
# Subtracting Negatives From Positives
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 1
multiplication_allowed = 0
division_allowed = 0
-typing_practice_allowed = 0
allow_negatives = 1
-min_augend = 0
-max_augend = 10
-min_addend = -10
-max_addend = -1
min_minuend = 0
max_minuend = 10
min_subtrahend = -10
max_subtrahend = -1
-min_multiplier = 0
-max_multiplier = 10
-min_multiplicand = 0
-max_multiplicand = 10
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
+format_answer_last = 1
format_sub_answer_last = 1
format_sub_answer_first = 0
format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 0
-format_div_answer_last = 0
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 40
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson49
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson49 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson49 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,41 @@
# Adding Negatives to Negatives
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 1
subtraction_allowed = 0
multiplication_allowed = 0
division_allowed = 0
-typing_practice_allowed = 0
allow_negatives = 1
min_augend = -10
max_augend = 0
min_addend = -10
max_addend = 0
-min_minuend = 0
-max_minuend = 10
-min_subtrahend = -10
-max_subtrahend = -1
-min_multiplier = 0
-max_multiplier = 10
-min_multiplicand = 0
-max_multiplicand = 10
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
+format_answer_last = 1
format_add_answer_last = 1
format_add_answer_first = 0
format_add_answer_middle = 0
-format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 0
-format_div_answer_last = 0
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 20
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 40
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson50
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson50 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson50 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,59 +1,41 @@
# Subtracting Negatives From Negatives
+
+# Math options
play_through_list = 1
-allow_speedup = 1
-use_feedback = 1
+typing_practice_allowed = 0
addition_allowed = 0
subtraction_allowed = 1
multiplication_allowed = 0
division_allowed = 0
-typing_practice_allowed = 0
allow_negatives = 1
-min_augend = -10
-max_augend = 0
-min_addend = -10
-max_addend = 0
min_minuend = -10
-max_minuend = 0
+max_minuend = -0
min_subtrahend = -10
max_subtrahend = 0
-min_multiplier = 0
-max_multiplier = 10
-min_multiplicand = 0
-max_multiplicand = 10
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
-save_summary = 1
-question_copies = 1
-repeat_wrongs = 1
-copies_repeated_wrongs = 2
-format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
+format_answer_last = 1
format_sub_answer_last = 1
format_sub_answer_first = 0
format_sub_answer_middle = 0
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 0
-format_div_answer_last = 0
-format_div_answer_first = 0
-format_div_answer_middle = 0
-max_answer = 999
-max_questions = 5000
+max_answer = 400
+save_summary = 1
+repeat_wrongs = 1
+copies_repeated_wrongs = 2
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 40
+vary_list_length = 0
+
+# General game options
+allow_speedup = 1
+use_feedback = 1
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
speed = 1.00
-max_speed = 10.00
+max_speed = 20.00
danger_level = 0.35
danger_level_speedup = 1
danger_level_max = 0.90
-city_explode_handicap = 0.00
-
+city_explode_handicap = 0.00
\ No newline at end of file
Modified: tuxmath/trunk/data/missions/lessons/lesson51
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson51 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/lesson51 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,4 +1,6 @@
# Negative and Positive Numbers Review
+
+# Math options
play_through_list = 1
allow_speedup = 1
use_feedback = 1
@@ -16,37 +18,29 @@
max_minuend = 3
min_subtrahend = -3
max_subtrahend = 3
-min_multiplier = 0
-max_multiplier = 10
-min_multiplicand = 0
-max_multiplicand = 10
-min_divisor = 0
-max_divisor = 10
-min_quotient = 0
-max_quotient = 10
-min_typing_num = 0
-max_typing_num = 10
save_summary = 1
question_copies = 1
repeat_wrongs = 1
copies_repeated_wrongs = 2
+format_answer_last = 1
+format_answer_first = 1
+format_answer_middle = 1
format_add_answer_last = 1
format_add_answer_first = 1
format_add_answer_middle = 1
format_sub_answer_last = 1
format_sub_answer_first = 1
format_sub_answer_middle = 1
-format_mult_answer_last = 0
-format_mult_answer_first = 0
-format_mult_answer_middle = 0
-format_div_answer_last = 0
-format_div_answer_first = 0
-format_div_answer_middle = 0
max_answer = 999
max_questions = 5000
randomize = 1
comprehensive = 1
-avg_list_length = 42
+min_formula_nums = 2
+max_formula_nums = 2
+avg_list_length = 40
+vary_list_length = 0
+
+# General game options
starting_comets = 2
extra_comets_per_wave = 2
max_comets = 10
Modified: tuxmath/trunk/data/missions/lessons/update-po.sh
===================================================================
--- tuxmath/trunk/data/missions/lessons/update-po.sh 2008-12-16 13:06:20 UTC (rev 810)
+++ tuxmath/trunk/data/missions/lessons/update-po.sh 2008-12-16 22:30:12 UTC (rev 811)
@@ -1,6 +1,8 @@
#!/bin/sh
# Create a 'source' file holding all the descriptions for the missions.
+# That file (descr_lessons) is listed in po/POTFILES.in so the strings will go into
+# tuxmath.pot and subsequently into the individual po files for translation.
# NOTE this script needs to be kept in the same dir as the lesson files
rm -f ./descr_lessons
for i in ./lesson*; do
More information about the Tux4kids-commits
mailing list