diff options
author | Simon Schampijer <simon@schampijer.de> | 2006-11-02 22:52:54 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2006-11-02 22:52:54 (GMT) |
commit | 2b2ca6d30f971ddb717fed89441bbc0cc1a7e0f3 (patch) | |
tree | 15c9df4ba087e39c7d99dab0efaf8ec9768612ef | |
parent | 316f65e25bb983c58688e58e8ec5a467d2ae77d0 (diff) |
Added a test game to the bundle. Have just to verify clicks of the sounds and maybe add a few more.
-rw-r--r-- | games/test/images/darabuka.jpg | bin | 0 -> 4696 bytes | |||
-rw-r--r-- | games/test/images/djembe.jpg | bin | 0 -> 7780 bytes | |||
-rw-r--r-- | games/test/images/flute.jpg | bin | 0 -> 1453 bytes | |||
-rw-r--r-- | games/test/images/gong.jpg | bin | 0 -> 7004 bytes | |||
-rw-r--r-- | games/test/images/maracas.jpg | bin | 0 -> 6914 bytes | |||
-rw-r--r-- | games/test/images/marimba.jpg | bin | 0 -> 9696 bytes | |||
-rw-r--r-- | games/test/images/piano.jpg | bin | 0 -> 7171 bytes | |||
-rw-r--r-- | games/test/images/reference | 9 | ||||
-rw-r--r-- | games/test/images/spring.jpg | bin | 0 -> 4783 bytes | |||
-rw-r--r-- | games/test/images/triangle.jpg | bin | 0 -> 5533 bytes | |||
-rw-r--r-- | games/test/sounds/darabuka | bin | 0 -> 106458 bytes | |||
-rw-r--r-- | games/test/sounds/djembe | bin | 0 -> 88346 bytes | |||
-rw-r--r-- | games/test/sounds/flute | bin | 0 -> 79462 bytes | |||
-rw-r--r-- | games/test/sounds/gam | bin | 0 -> 587702 bytes | |||
-rw-r--r-- | games/test/sounds/gong | bin | 0 -> 345758 bytes | |||
-rw-r--r-- | games/test/sounds/koto | bin | 0 -> 132550 bytes | |||
-rw-r--r-- | games/test/sounds/maracas | bin | 0 -> 106220 bytes | |||
-rw-r--r-- | games/test/sounds/marimba | bin | 0 -> 109176 bytes | |||
-rw-r--r-- | games/test/sounds/piano | bin | 0 -> 266808 bytes | |||
-rw-r--r-- | games/test/sounds/snare | bin | 0 -> 88244 bytes | |||
-rw-r--r-- | games/test/sounds/spring | bin | 0 -> 63752 bytes | |||
-rw-r--r-- | games/test/sounds/triangle | bin | 0 -> 165134 bytes | |||
-rw-r--r-- | games/test/test.mson | 9 | ||||
-rw-r--r-- | images/Makefile.am | 39 | ||||
-rwxr-xr-x | memosono.py | 6 |
25 files changed, 21 insertions, 42 deletions
diff --git a/games/test/images/darabuka.jpg b/games/test/images/darabuka.jpg Binary files differnew file mode 100644 index 0000000..b22d23b --- /dev/null +++ b/games/test/images/darabuka.jpg diff --git a/games/test/images/djembe.jpg b/games/test/images/djembe.jpg Binary files differnew file mode 100644 index 0000000..8e57235 --- /dev/null +++ b/games/test/images/djembe.jpg diff --git a/games/test/images/flute.jpg b/games/test/images/flute.jpg Binary files differnew file mode 100644 index 0000000..f1d5ffd --- /dev/null +++ b/games/test/images/flute.jpg diff --git a/games/test/images/gong.jpg b/games/test/images/gong.jpg Binary files differnew file mode 100644 index 0000000..f09b60d --- /dev/null +++ b/games/test/images/gong.jpg diff --git a/games/test/images/maracas.jpg b/games/test/images/maracas.jpg Binary files differnew file mode 100644 index 0000000..ca960a9 --- /dev/null +++ b/games/test/images/maracas.jpg diff --git a/games/test/images/marimba.jpg b/games/test/images/marimba.jpg Binary files differnew file mode 100644 index 0000000..82a08b7 --- /dev/null +++ b/games/test/images/marimba.jpg diff --git a/games/test/images/piano.jpg b/games/test/images/piano.jpg Binary files differnew file mode 100644 index 0000000..bc2ed83 --- /dev/null +++ b/games/test/images/piano.jpg diff --git a/games/test/images/reference b/games/test/images/reference new file mode 100644 index 0000000..3d703c4 --- /dev/null +++ b/games/test/images/reference @@ -0,0 +1,9 @@ +flute: Public domain image from Websters Dictionary 1911 (wikipedia) +gong: Public domain (wikipedia) +maracas: Axel Heymann GNU-Lizenz für freie Dokumentation (wikipedia) +marimba: Frederick Langhorst Creative Commons (wikipedia) +piano: Public domain (wikipedia) +spring: creative commons (wikipedia) +triangle: Public domain (wikipedia) +djembe: GNU-Lizenz für freie Dokumentation (wikipedia) +darbuka: GNU-Lizenz für freie Dokumentation (wikipedia) diff --git a/games/test/images/spring.jpg b/games/test/images/spring.jpg Binary files differnew file mode 100644 index 0000000..ff938c6 --- /dev/null +++ b/games/test/images/spring.jpg diff --git a/games/test/images/triangle.jpg b/games/test/images/triangle.jpg Binary files differnew file mode 100644 index 0000000..bb8a880 --- /dev/null +++ b/games/test/images/triangle.jpg diff --git a/games/test/sounds/darabuka b/games/test/sounds/darabuka Binary files differnew file mode 100644 index 0000000..8c574da --- /dev/null +++ b/games/test/sounds/darabuka diff --git a/games/test/sounds/djembe b/games/test/sounds/djembe Binary files differnew file mode 100644 index 0000000..1216fad --- /dev/null +++ b/games/test/sounds/djembe diff --git a/games/test/sounds/flute b/games/test/sounds/flute Binary files differnew file mode 100644 index 0000000..4a3d8f7 --- /dev/null +++ b/games/test/sounds/flute diff --git a/games/test/sounds/gam b/games/test/sounds/gam Binary files differnew file mode 100644 index 0000000..3ee64af --- /dev/null +++ b/games/test/sounds/gam diff --git a/games/test/sounds/gong b/games/test/sounds/gong Binary files differnew file mode 100644 index 0000000..4162e41 --- /dev/null +++ b/games/test/sounds/gong diff --git a/games/test/sounds/koto b/games/test/sounds/koto Binary files differnew file mode 100644 index 0000000..afb8c1d --- /dev/null +++ b/games/test/sounds/koto diff --git a/games/test/sounds/maracas b/games/test/sounds/maracas Binary files differnew file mode 100644 index 0000000..b32478d --- /dev/null +++ b/games/test/sounds/maracas diff --git a/games/test/sounds/marimba b/games/test/sounds/marimba Binary files differnew file mode 100644 index 0000000..5a4a727 --- /dev/null +++ b/games/test/sounds/marimba diff --git a/games/test/sounds/piano b/games/test/sounds/piano Binary files differnew file mode 100644 index 0000000..e6acf13 --- /dev/null +++ b/games/test/sounds/piano diff --git a/games/test/sounds/snare b/games/test/sounds/snare Binary files differnew file mode 100644 index 0000000..64a8b87 --- /dev/null +++ b/games/test/sounds/snare diff --git a/games/test/sounds/spring b/games/test/sounds/spring Binary files differnew file mode 100644 index 0000000..bd20256 --- /dev/null +++ b/games/test/sounds/spring diff --git a/games/test/sounds/triangle b/games/test/sounds/triangle Binary files differnew file mode 100644 index 0000000..230c91f --- /dev/null +++ b/games/test/sounds/triangle diff --git a/games/test/test.mson b/games/test/test.mson new file mode 100644 index 0000000..9e9e3d7 --- /dev/null +++ b/games/test/test.mson @@ -0,0 +1,9 @@ +darabuka.jpg darabuka +flute.jpg flute +maracas.jpg maracas +piano.jpg piano +triangle.jpg triangle +djembe.jpg djembe +gong.jpg gong +marimba.jpg marimba +spring.jpg spring diff --git a/images/Makefile.am b/images/Makefile.am deleted file mode 100644 index d192bf3..0000000 --- a/images/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -imagesdir = $(datadir)/sugar/activities/memosono/images -images_DATA = \ -black80.jpg \ -player1_0b.jpg \ -player1_0.jpg \ -player1_1b.jpg \ -player1_1.jpg \ -player1_2b.jpg \ -player1_2.jpg \ -player1_3b.jpg \ -player1_3.jpg \ -player1_4b.jpg \ -player1_4.jpg \ -player1_5b.jpg \ -player1_5.jpg \ -player1_6b.jpg \ -player1_6.jpg \ -player1_7b.jpg \ -player1_7.jpg \ -player1_8b.jpg \ -player1_8.jpg \ -player2_0b.jpg \ -player2_0.jpg \ -player2_1b.jpg \ -player2_1.jpg \ -player2_2b.jpg \ -player2_2.jpg \ -player2_3b.jpg \ -player2_3.jpg \ -player2_4b.jpg \ -player2_4.jpg \ -player2_5b.jpg \ -player2_5.jpg \ -player2_6b.jpg \ -player2_6.jpg \ -player2_7b.jpg \ -player2_7.jpg \ -player2_8b.jpg \ -player2_8.jpg diff --git a/memosono.py b/memosono.py index 34f7d93..206d35d 100755 --- a/memosono.py +++ b/memosono.py @@ -442,7 +442,7 @@ def read_config(filename, seed, numelems): # set random seed random.seed(seed) filecheck = filename.split('.') - if filecheck[1] != 'mson': + if filecheck[2] != 'mson': logging.error(' File format of %s'%filename) ## sys.exit() else: @@ -475,7 +475,7 @@ def pathes(filename): # read config file path = [] gamename = filename ##.split('.')[0] - home = os.environ["HOME"] + home = os.path.join(os.path.dirname(os.path.abspath(__file__)), "games") gamepath = os.path.join(home, gamename) logging.debug(gamepath) if not os.path.exists(gamepath): @@ -511,7 +511,7 @@ class MemosonoActivity(Activity): def __init__(self): Activity.__init__(self) self.connect('destroy', self._cleanup_cb) - self.gamename = 'composer' + self.gamename = 'test' self.set_title("Memosono - "+self.gamename) # set path |