[Tux4kids-commits] r1485 - in tuxmath/branches/lan/data: . menus missions/multiplay
David Bruce
dbruce-guest at alioth.debian.org
Fri Sep 4 19:07:17 UTC 2009
Author: dbruce-guest
Date: 2009-09-04 19:07:14 +0000 (Fri, 04 Sep 2009)
New Revision: 1485
Added:
tuxmath/branches/lan/data/menus/
tuxmath/branches/lan/data/menus/Makefile.am
tuxmath/branches/lan/data/menus/main_menu.xml
Modified:
tuxmath/branches/lan/data/Makefile.am
tuxmath/branches/lan/data/missions/multiplay/ace
tuxmath/branches/lan/data/missions/multiplay/commando
tuxmath/branches/lan/data/missions/multiplay/ranger
tuxmath/branches/lan/data/missions/multiplay/scout
tuxmath/branches/lan/data/missions/multiplay/space_cadet
Log:
fix merge conflicts
Modified: tuxmath/branches/lan/data/Makefile.am
===================================================================
--- tuxmath/branches/lan/data/Makefile.am 2009-09-04 19:06:11 UTC (rev 1484)
+++ tuxmath/branches/lan/data/Makefile.am 2009-09-04 19:07:14 UTC (rev 1485)
@@ -3,6 +3,7 @@
SUBDIRS = fonts \
images \
+ menus \
missions \
sounds
Property changes on: tuxmath/branches/lan/data/menus
___________________________________________________________________
Added: svn:ignore
+ *~
*.o
Makefile
Makefile.in
Added: tuxmath/branches/lan/data/menus/Makefile.am
===================================================================
--- tuxmath/branches/lan/data/menus/Makefile.am (rev 0)
+++ tuxmath/branches/lan/data/menus/Makefile.am 2009-09-04 19:07:14 UTC (rev 1485)
@@ -0,0 +1,7 @@
+## Makefile.am for tuxmath - data/menus:
+## Process with Automake to create Makefile.in
+
+menusdir = $(pkgdatadir)/menus
+
+dist_menus_DATA = main_menu.xml
+
Added: tuxmath/branches/lan/data/menus/main_menu.xml
===================================================================
--- tuxmath/branches/lan/data/menus/main_menu.xml (rev 0)
+++ tuxmath/branches/lan/data/menus/main_menu.xml 2009-09-04 19:07:14 UTC (rev 1485)
@@ -0,0 +1,54 @@
+<menu title="Main Menu" entries="7">
+ <menu title="Play Alone" sprite="alone" entries="5">
+ <item title="Math Command Training Academy" sprite="lesson" run="RUN_ACADEMY">
+ <item title="Math Command Fleet Missions" sprite="fleet" run="RUN_CAMPAIGN">
+ <menu title="Play Arcade Game" sprite="comet" entries="7">
+ <item title="Space Cadet" sprite="tux_helmet_yellow" run="RUN_ARCADE" param="0">
+ <item title="Scout" sprite="tux_helmet_green" run="RUN_ARCADE" param="1">
+ <item title="Ranger" sprite="tux_helmet_blue" run="RUN_ARCADE" param="2">
+ <item title="Ace" sprite="tux_helmet_red" run="RUN_ARCADE" param="3">
+ <item title="Commando" sprite="tux_helmet_black" run="RUN_ARCADE" param="4">
+ <item title="Hall Of Fame" sprite="trophy" run="RUN_HALL_OF_FAME">
+ <item title="Main Menu" sprite="main" run="RUN_MAIN_MENU">
+ </menu>
+ <item title="Play Custom Game" sprite="tux_config_brown" run="RUN_CUSTOM">
+ <item title="Main Menu" sprite="main" run="RUN_MAIN_MENU">
+ </menu>
+ <menu title="LAN Game" sprite="lan" entries="3">
+ <item title="Host" sprite="lan" run="RUN_LAN_HOST">
+ <item title="Join" sprite="lan" run="RUN_LAN_JOIN">
+ <item title="Main Menu" sprite="main" run="RUN_MAIN_MENU">
+ </menu>
+ <menu title="Play With Friends" sprite="friends" entries="3">
+ <menu title="Score Sweep" sprite="nums" entries="6">
+ <item title="Space Cadet" sprite="tux_helmet_yellow" run="RUN_SCORE_SWEEP" param="0">
+ <item title="Scout" sprite="tux_helmet_green" run="RUN_SCORE_SWEEP" param="1">
+ <item title="Ranger" sprite="tux_helmet_blue" run="RUN_SCORE_SWEEP" param="2">
+ <item title="Ace" sprite="tux_helmet_red" run="RUN_SCORE_SWEEP" param="3">
+ <item title="Commando" sprite="tux_helmet_black" run="RUN_SCORE_SWEEP" param="4">
+ <item title="Main Menu" sprite="main" run="RUN_MAIN_MENU">
+ </menu>
+ <menu title="Elimination" sprite="exclamation" entries="6">
+ <item title="Space Cadet" sprite="tux_helmet_yellow" run="RUN_ELIMINATION" param="0">
+ <item title="Scout" sprite="tux_helmet_green" run="RUN_ELIMINATION" param="1">
+ <item title="Ranger" sprite="tux_helmet_blue" run="RUN_ELIMINATION" param="2">
+ <item title="Ace" sprite="tux_helmet_red" run="RUN_ELIMINATION" param="3">
+ <item title="Commando" sprite="tux_helmet_black" run="RUN_ELIMINATION" param="4">
+ <item title="Main Menu" sprite="main" run="RUN_MAIN_MENU">
+ </menu>
+ <item title="Main Menu" sprite="main" run="RUN_MAIN_MENU">
+ </menu>
+ <menu title="Factoroids!" sprite="factoroids" entries="3">
+ <item title="Factors" sprite="factors" run="RUN_FACTORS">
+ <item title="Fractions" sprite="fractions" run="RUN_FRACTIONS">
+ <item title="Main Menu" sprite="main" run="RUN_MAIN_MENU">
+ </menu>
+ <item title="Help" sprite="help" run="RUN_HELP">
+ <menu title="More Options" sprite="tux_config" entries="4">
+ <item title="Demo" sprite="comet" run="RUN_DEMO">
+ <item title="Project Info" sprite="help" run="RUN_INFO">
+ <item title="Credits" sprite="credits" run="RUN_CREDITS">
+ <item title="Main Menu" sprite="main" run="RUN_MAIN_MENU">
+ </menu>
+ <item title="Quit" sprite="quit" run="RUN_QUIT">
+</menu>
Modified: tuxmath/branches/lan/data/missions/multiplay/ace
===================================================================
--- tuxmath/branches/lan/data/missions/multiplay/ace 2009-09-04 19:06:11 UTC (rev 1484)
+++ tuxmath/branches/lan/data/missions/multiplay/ace 2009-09-04 19:07:14 UTC (rev 1485)
@@ -1,6 +1,5 @@
# multiplay ace lesson file
-play_through_list = 0
allow_speedup = 1
use_feedback = 0
addition_allowed = 1
@@ -46,7 +45,7 @@
comprehensive = 1
min_formula_nums = 2
max_formula_nums = 2
-avg_list_length = 250
+avg_list_length = 25
vary_list_length = 0
max_answer = 400
starting_comets = 2
@@ -58,7 +57,5 @@
slow_after_wrong = 0
max_questions = 25000
bonus_comet_interval = 20
-fraction_to_keep = 1
allow_pause = 0
bonus_speed_ratio = 2.0
-
Modified: tuxmath/branches/lan/data/missions/multiplay/commando
===================================================================
--- tuxmath/branches/lan/data/missions/multiplay/commando 2009-09-04 19:06:11 UTC (rev 1484)
+++ tuxmath/branches/lan/data/missions/multiplay/commando 2009-09-04 19:07:14 UTC (rev 1485)
@@ -1,6 +1,5 @@
# multiplay commando lesson file
-play_through_list = 0
allow_speedup = 1
use_feedback = 0
addition_allowed = 1
@@ -46,7 +45,7 @@
comprehensive = 0
min_formula_nums = 3
max_formula_nums = 4
-avg_list_length = 250
+avg_list_length = 25
vary_list_length = 0
starting_comets = 2
extra_comets_per_wave = 2
@@ -57,7 +56,5 @@
slow_after_wrong = 1
max_questions = 25000
bonus_comet_interval = 20
-fraction_to_keep = 1
allow_pause = 0
bonus_speed_ratio = 2.0
-
Modified: tuxmath/branches/lan/data/missions/multiplay/ranger
===================================================================
--- tuxmath/branches/lan/data/missions/multiplay/ranger 2009-09-04 19:06:11 UTC (rev 1484)
+++ tuxmath/branches/lan/data/missions/multiplay/ranger 2009-09-04 19:07:14 UTC (rev 1485)
@@ -1,6 +1,5 @@
# multiplay_ranger lesson file
-play_through_list = 0
allow_speedup = 1
use_feedback = 0
addition_allowed = 1
@@ -47,7 +46,7 @@
comprehensive = 1
min_formula_nums = 2
max_formula_nums = 2
-avg_list_length = 250
+avg_list_length = 25
vary_list_length = 0
starting_comets = 2
@@ -59,6 +58,5 @@
slow_after_wrong = 0
max_questions = 25000
bonus_comet_interval = 10
-fraction_to_keep = 1.00
allow_pause = 0
bonus_speed_ratio = 1.8
Modified: tuxmath/branches/lan/data/missions/multiplay/scout
===================================================================
--- tuxmath/branches/lan/data/missions/multiplay/scout 2009-09-04 19:06:11 UTC (rev 1484)
+++ tuxmath/branches/lan/data/missions/multiplay/scout 2009-09-04 19:07:14 UTC (rev 1485)
@@ -1,6 +1,5 @@
# multiplay_scout lesson file
-play_through_list = 0
allow_speedup = 1
use_feedback = 0
addition_allowed = 1
@@ -34,7 +33,7 @@
comprehensive = 1
min_formula_nums = 2
max_formula_nums = 2
-avg_list_length = 250
+avg_list_length = 25
vary_list_length = 0
max_answer = 20
starting_comets = 2
@@ -46,7 +45,5 @@
slow_after_wrong = 0
max_questions = 5000
bonus_comet_interval = 10
-fraction_to_keep = 1.00
allow_pause = 0
bonus_speed_ratio = 1.5
-
Modified: tuxmath/branches/lan/data/missions/multiplay/space_cadet
===================================================================
--- tuxmath/branches/lan/data/missions/multiplay/space_cadet 2009-09-04 19:06:11 UTC (rev 1484)
+++ tuxmath/branches/lan/data/missions/multiplay/space_cadet 2009-09-04 19:07:14 UTC (rev 1485)
@@ -1,6 +1,5 @@
# multiplay space cadet lesson file
-play_through_list = 0
allow_speedup = 1
use_feedback = 0
addition_allowed = 1
@@ -25,7 +24,7 @@
comprehensive = 1
min_formula_nums = 2
max_formula_nums = 2
-avg_list_length = 121
+avg_list_length = 12
vary_list_length = 0
max_answer = 10
starting_comets = 2
@@ -37,6 +36,5 @@
slow_after_wrong = 0
max_questions = 5000
bonus_comet_interval = 10
-fraction_to_keep = 1.00
allow_pause = 0
bonus_speed_ratio = 1.2
More information about the Tux4kids-commits
mailing list