diff options
| author | Simon Schampijer <simon@schampijer.de> | 2007-01-04 12:28:58 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2007-01-04 12:28:58 (GMT) |
| commit | 3f9ba56d2b76a6d99a020bf84b98392832ee04c7 (patch) | |
| tree | 6a8efb2088b4a2c7150bc1e7c25ffbafb720b153 /games | |
| parent | 64c400bb24649218f54d6dcee2928015416f8875 (diff) | |
a) Fixed a bug in line 110 (self.count&self.numpairs --> self.count==self.numpairs). This comparison could lead into wrong decisions by the model.
b) added a new game to show better the capabilities of this game (e.g. similar sounds)
c) a bigger grid
Diffstat (limited to 'games')
71 files changed, 42 insertions, 18 deletions
diff --git a/games/drumgit/drumgit.mson b/games/drumgit/drumgit.mson new file mode 100644 index 0000000..a006e87 --- /dev/null +++ b/games/drumgit/drumgit.mson @@ -0,0 +1,24 @@ +drumkit1_b.jpg beat1_a.aiff +drumkit2_b.jpg beat1_b.aiff +drumkit3_b.jpg beat1_c.aiff +drumkit4_b.jpg beat8.aiff +drumkit5_b.jpg beat2.aiff +drumkit6_b.jpg beat3.aiff +drumkit7_b.jpg beat4.aiff +drumkit8_b.jpg beat14.aiff +drumkit9_b.jpg beat6_2.aiff +drumkit10_b.jpg beat16.aiff +drumkit11_b.jpg beat17.aiff +drumkit12_b.jpg beat10.aiff +guitar1_2.jpg bending_a.aiff +guitar2_2.jpg bending_b.aiff +guitar3_2.jpg flashcomp2a.aiff +guitar4_2.jpg flashcomp2b.aiff +guitar5_2.jpg gedaempft.aiff +guitar6_2.jpg ungedaempft.aiff +guitar7_2.jpg jimi4.aiff +guitar8_2.jpg git_hit1.aiff +guitar9_2.jpg git_hit4.aiff +guitar10_2.jpg guitcello.aiff +guitar11_2.jpg flasholet4.aiff +guitar12_2.jpg jimi1.aiff diff --git a/games/drumgit/images/drumkit10_b.jpg b/games/drumgit/images/drumkit10_b.jpg Binary files differnew file mode 100644 index 0000000..9288d4c --- /dev/null +++ b/games/drumgit/images/drumkit10_b.jpg diff --git a/games/drumgit/images/drumkit11_b.jpg b/games/drumgit/images/drumkit11_b.jpg Binary files differnew file mode 100644 index 0000000..cd169ce --- /dev/null +++ b/games/drumgit/images/drumkit11_b.jpg diff --git a/games/drumgit/images/drumkit12_b.jpg b/games/drumgit/images/drumkit12_b.jpg Binary files differnew file mode 100644 index 0000000..f10ade8 --- /dev/null +++ b/games/drumgit/images/drumkit12_b.jpg diff --git a/games/drumgit/images/drumkit1_b.jpg b/games/drumgit/images/drumkit1_b.jpg Binary files differnew file mode 100644 index 0000000..98ab27d --- /dev/null +++ b/games/drumgit/images/drumkit1_b.jpg diff --git a/games/drumgit/images/drumkit2_b.jpg b/games/drumgit/images/drumkit2_b.jpg Binary files differnew file mode 100644 index 0000000..e1a7fc7 --- /dev/null +++ b/games/drumgit/images/drumkit2_b.jpg diff --git a/games/drumgit/images/drumkit3_b.jpg b/games/drumgit/images/drumkit3_b.jpg Binary files differnew file mode 100644 index 0000000..3a75f41 --- /dev/null +++ b/games/drumgit/images/drumkit3_b.jpg diff --git a/games/drumgit/images/drumkit4_b.jpg b/games/drumgit/images/drumkit4_b.jpg Binary files differnew file mode 100644 index 0000000..a4c5b97 --- /dev/null +++ b/games/drumgit/images/drumkit4_b.jpg diff --git a/games/drumgit/images/drumkit5_b.jpg b/games/drumgit/images/drumkit5_b.jpg Binary files differnew file mode 100644 index 0000000..063ef59 --- /dev/null +++ b/games/drumgit/images/drumkit5_b.jpg diff --git a/games/drumgit/images/drumkit6_b.jpg b/games/drumgit/images/drumkit6_b.jpg Binary files differnew file mode 100644 index 0000000..991edd8 --- /dev/null +++ b/games/drumgit/images/drumkit6_b.jpg diff --git a/games/drumgit/images/drumkit7_b.jpg b/games/drumgit/images/drumkit7_b.jpg Binary files differnew file mode 100644 index 0000000..4f993e7 --- /dev/null +++ b/games/drumgit/images/drumkit7_b.jpg diff --git a/games/drumgit/images/drumkit8_b.jpg b/games/drumgit/images/drumkit8_b.jpg Binary files differnew file mode 100644 index 0000000..dfdd67c --- /dev/null +++ b/games/drumgit/images/drumkit8_b.jpg diff --git a/games/drumgit/images/drumkit9_b.jpg b/games/drumgit/images/drumkit9_b.jpg Binary files differnew file mode 100644 index 0000000..16197e4 --- /dev/null +++ b/games/drumgit/images/drumkit9_b.jpg diff --git a/games/drumgit/images/guitar10_2.jpg b/games/drumgit/images/guitar10_2.jpg Binary files differnew file mode 100644 index 0000000..cc1f29b --- /dev/null +++ b/games/drumgit/images/guitar10_2.jpg diff --git a/games/drumgit/images/guitar11_2.jpg b/games/drumgit/images/guitar11_2.jpg Binary files differnew file mode 100644 index 0000000..a738ef2 --- /dev/null +++ b/games/drumgit/images/guitar11_2.jpg diff --git a/games/drumgit/images/guitar12_2.jpg b/games/drumgit/images/guitar12_2.jpg Binary files differnew file mode 100644 index 0000000..2998cfe --- /dev/null +++ b/games/drumgit/images/guitar12_2.jpg diff --git a/games/drumgit/images/guitar1_2.jpg b/games/drumgit/images/guitar1_2.jpg Binary files differnew file mode 100644 index 0000000..89dbd7c --- /dev/null +++ b/games/drumgit/images/guitar1_2.jpg diff --git a/games/drumgit/images/guitar2_2.jpg b/games/drumgit/images/guitar2_2.jpg Binary files differnew file mode 100644 index 0000000..6766232 --- /dev/null +++ b/games/drumgit/images/guitar2_2.jpg diff --git a/games/drumgit/images/guitar3_2.jpg b/games/drumgit/images/guitar3_2.jpg Binary files differnew file mode 100644 index 0000000..3cf7431 --- /dev/null +++ b/games/drumgit/images/guitar3_2.jpg diff --git a/games/drumgit/images/guitar4_2.jpg b/games/drumgit/images/guitar4_2.jpg Binary files differnew file mode 100644 index 0000000..ea12232 --- /dev/null +++ b/games/drumgit/images/guitar4_2.jpg diff --git a/games/drumgit/images/guitar5_2.jpg b/games/drumgit/images/guitar5_2.jpg Binary files differnew file mode 100644 index 0000000..a5cec0d --- /dev/null +++ b/games/drumgit/images/guitar5_2.jpg diff --git a/games/drumgit/images/guitar6_2.jpg b/games/drumgit/images/guitar6_2.jpg Binary files differnew file mode 100644 index 0000000..6212245 --- /dev/null +++ b/games/drumgit/images/guitar6_2.jpg diff --git a/games/drumgit/images/guitar7_2.jpg b/games/drumgit/images/guitar7_2.jpg Binary files differnew file mode 100644 index 0000000..356a90f --- /dev/null +++ b/games/drumgit/images/guitar7_2.jpg diff --git a/games/drumgit/images/guitar8_2.jpg b/games/drumgit/images/guitar8_2.jpg Binary files differnew file mode 100644 index 0000000..2b33f99 --- /dev/null +++ b/games/drumgit/images/guitar8_2.jpg diff --git a/games/drumgit/images/guitar9_2.jpg b/games/drumgit/images/guitar9_2.jpg Binary files differnew file mode 100644 index 0000000..691423d --- /dev/null +++ b/games/drumgit/images/guitar9_2.jpg diff --git a/games/drumgit/images/reference b/games/drumgit/images/reference new file mode 100644 index 0000000..79ce4c4 --- /dev/null +++ b/games/drumgit/images/reference @@ -0,0 +1,18 @@ +The guitar pictures are distributed under the Creative Commons Attribution ShareAlike 2.0 Germany License since they derive of the following work: + +guitar: + creator: Martin Moeller + name: Classical_Guitar_two_views + licence: Creative Commons Attribution ShareAlike 2.0 Germany License + (http://creativecommons.org/licenses/by-sa/2.0/de/) + link: http://de.wikipedia.org/wiki/Bild:Classical_Guitar_two_views.jpg + + +The drumkit pictures are distributed under the GNU Free Documentation License since they derive of the following work: + +drumkit: + creator: Clngre + name: Illustration of a drum kit for "drum kit component" + licence: GNU-Lizenz für freie Dokumentation + (http://commons.wikimedia.org/wiki/Commons:GNU_Free_Documentation_License) + found at: http://de.wikipedia.org/wiki/Bild:Drum_kit_illustration_template.png
\ No newline at end of file diff --git a/games/drumgit/sounds/beat10.aiff b/games/drumgit/sounds/beat10.aiff Binary files differnew file mode 100644 index 0000000..7a86e46 --- /dev/null +++ b/games/drumgit/sounds/beat10.aiff diff --git a/games/drumgit/sounds/beat14.aiff b/games/drumgit/sounds/beat14.aiff Binary files differnew file mode 100644 index 0000000..ae530e2 --- /dev/null +++ b/games/drumgit/sounds/beat14.aiff diff --git a/games/drumgit/sounds/beat16.aiff b/games/drumgit/sounds/beat16.aiff Binary files differnew file mode 100644 index 0000000..9bd9474 --- /dev/null +++ b/games/drumgit/sounds/beat16.aiff diff --git a/games/drumgit/sounds/beat17.aiff b/games/drumgit/sounds/beat17.aiff Binary files differnew file mode 100644 index 0000000..92990b4 --- /dev/null +++ b/games/drumgit/sounds/beat17.aiff diff --git a/games/drumgit/sounds/beat1_a.aiff b/games/drumgit/sounds/beat1_a.aiff Binary files differnew file mode 100644 index 0000000..654ba5f --- /dev/null +++ b/games/drumgit/sounds/beat1_a.aiff diff --git a/games/drumgit/sounds/beat1_b.aiff b/games/drumgit/sounds/beat1_b.aiff Binary files differnew file mode 100644 index 0000000..a8328e9 --- /dev/null +++ b/games/drumgit/sounds/beat1_b.aiff diff --git a/games/drumgit/sounds/beat1_c.aiff b/games/drumgit/sounds/beat1_c.aiff Binary files differnew file mode 100644 index 0000000..776bb23 --- /dev/null +++ b/games/drumgit/sounds/beat1_c.aiff diff --git a/games/drumgit/sounds/beat2.aiff b/games/drumgit/sounds/beat2.aiff Binary files differnew file mode 100644 index 0000000..33069d4 --- /dev/null +++ b/games/drumgit/sounds/beat2.aiff diff --git a/games/drumgit/sounds/beat3.aiff b/games/drumgit/sounds/beat3.aiff Binary files differnew file mode 100644 index 0000000..3c22de6 --- /dev/null +++ b/games/drumgit/sounds/beat3.aiff diff --git a/games/drumgit/sounds/beat4.aiff b/games/drumgit/sounds/beat4.aiff Binary files differnew file mode 100644 index 0000000..1c2fe08 --- /dev/null +++ b/games/drumgit/sounds/beat4.aiff diff --git a/games/drumgit/sounds/beat6_2.aiff b/games/drumgit/sounds/beat6_2.aiff Binary files differnew file mode 100644 index 0000000..911e630 --- /dev/null +++ b/games/drumgit/sounds/beat6_2.aiff diff --git a/games/drumgit/sounds/beat8.aiff b/games/drumgit/sounds/beat8.aiff Binary files differnew file mode 100644 index 0000000..fa85017 --- /dev/null +++ b/games/drumgit/sounds/beat8.aiff diff --git a/games/drumgit/sounds/bending_a.aiff b/games/drumgit/sounds/bending_a.aiff Binary files differnew file mode 100644 index 0000000..661c67f --- /dev/null +++ b/games/drumgit/sounds/bending_a.aiff diff --git a/games/drumgit/sounds/bending_b.aiff b/games/drumgit/sounds/bending_b.aiff Binary files differnew file mode 100644 index 0000000..ddbfb97 --- /dev/null +++ b/games/drumgit/sounds/bending_b.aiff diff --git a/games/drumgit/sounds/flashcomp2a.aiff b/games/drumgit/sounds/flashcomp2a.aiff Binary files differnew file mode 100644 index 0000000..3b5f284 --- /dev/null +++ b/games/drumgit/sounds/flashcomp2a.aiff diff --git a/games/drumgit/sounds/flashcomp2b.aiff b/games/drumgit/sounds/flashcomp2b.aiff Binary files differnew file mode 100644 index 0000000..0d7d14d --- /dev/null +++ b/games/drumgit/sounds/flashcomp2b.aiff diff --git a/games/drumgit/sounds/flasholet4.aiff b/games/drumgit/sounds/flasholet4.aiff Binary files differnew file mode 100644 index 0000000..0c4d56e --- /dev/null +++ b/games/drumgit/sounds/flasholet4.aiff diff --git a/games/drumgit/sounds/gedaempft.aiff b/games/drumgit/sounds/gedaempft.aiff Binary files differnew file mode 100644 index 0000000..0ede22e --- /dev/null +++ b/games/drumgit/sounds/gedaempft.aiff diff --git a/games/drumgit/sounds/git_hit1.aiff b/games/drumgit/sounds/git_hit1.aiff Binary files differnew file mode 100644 index 0000000..ac7a33e --- /dev/null +++ b/games/drumgit/sounds/git_hit1.aiff diff --git a/games/drumgit/sounds/git_hit4.aiff b/games/drumgit/sounds/git_hit4.aiff Binary files differnew file mode 100644 index 0000000..528d843 --- /dev/null +++ b/games/drumgit/sounds/git_hit4.aiff diff --git a/games/drumgit/sounds/guitcello.aiff b/games/drumgit/sounds/guitcello.aiff Binary files differnew file mode 100644 index 0000000..0d5c90b --- /dev/null +++ b/games/drumgit/sounds/guitcello.aiff diff --git a/games/drumgit/sounds/jimi1.aiff b/games/drumgit/sounds/jimi1.aiff Binary files differnew file mode 100644 index 0000000..94c50e4 --- /dev/null +++ b/games/drumgit/sounds/jimi1.aiff diff --git a/games/drumgit/sounds/jimi4.aiff b/games/drumgit/sounds/jimi4.aiff Binary files differnew file mode 100644 index 0000000..a70611a --- /dev/null +++ b/games/drumgit/sounds/jimi4.aiff diff --git a/games/drumgit/sounds/ungedaempft.aiff b/games/drumgit/sounds/ungedaempft.aiff Binary files differnew file mode 100644 index 0000000..d9e5d7c --- /dev/null +++ b/games/drumgit/sounds/ungedaempft.aiff diff --git a/games/test/images/darabuka.jpg b/games/test/images/darabuka.jpg Binary files differdeleted file mode 100644 index 1146d8c..0000000 --- a/games/test/images/darabuka.jpg +++ /dev/null diff --git a/games/test/images/djembe.jpg b/games/test/images/djembe.jpg Binary files differdeleted file mode 100644 index 264d137..0000000 --- a/games/test/images/djembe.jpg +++ /dev/null diff --git a/games/test/images/flute.jpg b/games/test/images/flute.jpg Binary files differdeleted file mode 100644 index ae58db3..0000000 --- a/games/test/images/flute.jpg +++ /dev/null diff --git a/games/test/images/gong.jpg b/games/test/images/gong.jpg Binary files differdeleted file mode 100644 index dbe7bcf..0000000 --- a/games/test/images/gong.jpg +++ /dev/null diff --git a/games/test/images/maracas.jpg b/games/test/images/maracas.jpg Binary files differdeleted file mode 100644 index ce15a4d..0000000 --- a/games/test/images/maracas.jpg +++ /dev/null diff --git a/games/test/images/marimba.jpg b/games/test/images/marimba.jpg Binary files differdeleted file mode 100644 index e6a2b73..0000000 --- a/games/test/images/marimba.jpg +++ /dev/null diff --git a/games/test/images/piano.jpg b/games/test/images/piano.jpg Binary files differdeleted file mode 100644 index 7e117f4..0000000 --- a/games/test/images/piano.jpg +++ /dev/null diff --git a/games/test/images/reference b/games/test/images/reference deleted file mode 100644 index 3d703c4..0000000 --- a/games/test/images/reference +++ /dev/null @@ -1,9 +0,0 @@ -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 differdeleted file mode 100644 index 309bcc5..0000000 --- a/games/test/images/spring.jpg +++ /dev/null diff --git a/games/test/images/triangle.jpg b/games/test/images/triangle.jpg Binary files differdeleted file mode 100644 index 4e04308..0000000 --- a/games/test/images/triangle.jpg +++ /dev/null diff --git a/games/test/sounds/darabuka b/games/test/sounds/darabuka Binary files differdeleted file mode 100644 index 28c38b6..0000000 --- a/games/test/sounds/darabuka +++ /dev/null diff --git a/games/test/sounds/djembe b/games/test/sounds/djembe Binary files differdeleted file mode 100644 index 0c6e3b7..0000000 --- a/games/test/sounds/djembe +++ /dev/null diff --git a/games/test/sounds/flute b/games/test/sounds/flute Binary files differdeleted file mode 100644 index 3331948..0000000 --- a/games/test/sounds/flute +++ /dev/null diff --git a/games/test/sounds/gam b/games/test/sounds/gam Binary files differdeleted file mode 100644 index f798d48..0000000 --- a/games/test/sounds/gam +++ /dev/null diff --git a/games/test/sounds/gong b/games/test/sounds/gong Binary files differdeleted file mode 100644 index 66261bb..0000000 --- a/games/test/sounds/gong +++ /dev/null diff --git a/games/test/sounds/maracas b/games/test/sounds/maracas Binary files differdeleted file mode 100644 index 5d20d9b..0000000 --- a/games/test/sounds/maracas +++ /dev/null diff --git a/games/test/sounds/marimba b/games/test/sounds/marimba Binary files differdeleted file mode 100644 index 6804f9f..0000000 --- a/games/test/sounds/marimba +++ /dev/null diff --git a/games/test/sounds/piano b/games/test/sounds/piano Binary files differdeleted file mode 100644 index e2f1354..0000000 --- a/games/test/sounds/piano +++ /dev/null diff --git a/games/test/sounds/spring b/games/test/sounds/spring Binary files differdeleted file mode 100644 index fc76f76..0000000 --- a/games/test/sounds/spring +++ /dev/null diff --git a/games/test/sounds/triangle b/games/test/sounds/triangle Binary files differdeleted file mode 100644 index 9a7e352..0000000 --- a/games/test/sounds/triangle +++ /dev/null diff --git a/games/test/test.mson b/games/test/test.mson deleted file mode 100644 index 9e9e3d7..0000000 --- a/games/test/test.mson +++ /dev/null @@ -1,9 +0,0 @@ -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 |
