diff --git a/www/img/ALT/elefant.jpg b/_RemoveForDeployment_/Images/Images-ALT/elefant.jpg similarity index 100% rename from www/img/ALT/elefant.jpg rename to _RemoveForDeployment_/Images/Images-ALT/elefant.jpg diff --git a/www/img/ALT/esel.jpg b/_RemoveForDeployment_/Images/Images-ALT/esel.jpg similarity index 100% rename from www/img/ALT/esel.jpg rename to _RemoveForDeployment_/Images/Images-ALT/esel.jpg diff --git a/www/img/ALT/hahn.jpg b/_RemoveForDeployment_/Images/Images-ALT/hahn.jpg similarity index 100% rename from www/img/ALT/hahn.jpg rename to _RemoveForDeployment_/Images/Images-ALT/hahn.jpg diff --git a/www/img/ALT/hund.jpg b/_RemoveForDeployment_/Images/Images-ALT/hund.jpg similarity index 100% rename from www/img/ALT/hund.jpg rename to _RemoveForDeployment_/Images/Images-ALT/hund.jpg diff --git a/www/img/ALT/katze.jpg b/_RemoveForDeployment_/Images/Images-ALT/katze.jpg similarity index 100% rename from www/img/ALT/katze.jpg rename to _RemoveForDeployment_/Images/Images-ALT/katze.jpg diff --git a/www/img/ALT/kuh.jpg b/_RemoveForDeployment_/Images/Images-ALT/kuh.jpg similarity index 100% rename from www/img/ALT/kuh.jpg rename to _RemoveForDeployment_/Images/Images-ALT/kuh.jpg diff --git a/www/img/ALT/maus.jpg b/_RemoveForDeployment_/Images/Images-ALT/maus.jpg similarity index 100% rename from www/img/ALT/maus.jpg rename to _RemoveForDeployment_/Images/Images-ALT/maus.jpg diff --git a/www/img/ALT/schaf.jpg b/_RemoveForDeployment_/Images/Images-ALT/schaf.jpg similarity index 100% rename from www/img/ALT/schaf.jpg rename to _RemoveForDeployment_/Images/Images-ALT/schaf.jpg diff --git a/www/img/Teddybear/Teddy2.png b/_RemoveForDeployment_/Images/PNG/Teddy2.png similarity index 100% rename from www/img/Teddybear/Teddy2.png rename to _RemoveForDeployment_/Images/PNG/Teddy2.png diff --git a/www/img/Teddybear/Teddy2_1.png b/_RemoveForDeployment_/Images/PNG/Teddy2_1.png similarity index 100% rename from www/img/Teddybear/Teddy2_1.png rename to _RemoveForDeployment_/Images/PNG/Teddy2_1.png diff --git a/www/img/Teddybear/Teddy3.png b/_RemoveForDeployment_/Images/PNG/Teddy3.png similarity index 100% rename from www/img/Teddybear/Teddy3.png rename to _RemoveForDeployment_/Images/PNG/Teddy3.png diff --git a/www/img/Teddybear/Teddy3_1.png b/_RemoveForDeployment_/Images/PNG/Teddy3_1.png similarity index 100% rename from www/img/Teddybear/Teddy3_1.png rename to _RemoveForDeployment_/Images/PNG/Teddy3_1.png diff --git a/www/img/Teddybear/Teddy4.png b/_RemoveForDeployment_/Images/PNG/Teddy4.png similarity index 100% rename from www/img/Teddybear/Teddy4.png rename to _RemoveForDeployment_/Images/PNG/Teddy4.png diff --git a/www/img/Teddybear/Teddy4_1.png b/_RemoveForDeployment_/Images/PNG/Teddy4_1.png similarity index 100% rename from www/img/Teddybear/Teddy4_1.png rename to _RemoveForDeployment_/Images/PNG/Teddy4_1.png diff --git a/www/img/Teddybear/Teddy5.png b/_RemoveForDeployment_/Images/PNG/Teddy5.png similarity index 100% rename from www/img/Teddybear/Teddy5.png rename to _RemoveForDeployment_/Images/PNG/Teddy5.png diff --git a/www/img/Teddybear/Teddy5_1.png b/_RemoveForDeployment_/Images/PNG/Teddy5_1.png similarity index 100% rename from www/img/Teddybear/Teddy5_1.png rename to _RemoveForDeployment_/Images/PNG/Teddy5_1.png diff --git a/www/img/Teddybear/Teddy6.png b/_RemoveForDeployment_/Images/PNG/Teddy6.png similarity index 100% rename from www/img/Teddybear/Teddy6.png rename to _RemoveForDeployment_/Images/PNG/Teddy6.png diff --git a/www/img/Teddybear/Teddy6_1.png b/_RemoveForDeployment_/Images/PNG/Teddy6_1.png similarity index 100% rename from www/img/Teddybear/Teddy6_1.png rename to _RemoveForDeployment_/Images/PNG/Teddy6_1.png diff --git a/www/img/Teddybear/Teddy7.png b/_RemoveForDeployment_/Images/PNG/Teddy7.png similarity index 100% rename from www/img/Teddybear/Teddy7.png rename to _RemoveForDeployment_/Images/PNG/Teddy7.png diff --git a/www/img/Teddybear/Teddy7_1.png b/_RemoveForDeployment_/Images/PNG/Teddy7_1.png similarity index 100% rename from www/img/Teddybear/Teddy7_1.png rename to _RemoveForDeployment_/Images/PNG/Teddy7_1.png diff --git a/www/img/Teddybear/Teddy8.png b/_RemoveForDeployment_/Images/PNG/Teddy8.png similarity index 100% rename from www/img/Teddybear/Teddy8.png rename to _RemoveForDeployment_/Images/PNG/Teddy8.png diff --git a/www/img/Teddybear/Teddy8_1.png b/_RemoveForDeployment_/Images/PNG/Teddy8_1.png similarity index 100% rename from www/img/Teddybear/Teddy8_1.png rename to _RemoveForDeployment_/Images/PNG/Teddy8_1.png diff --git a/www/img/Teddybear/Teddy_klein/Teddybear.psd b/_RemoveForDeployment_/Images/PSD/Teddybeargross.psd similarity index 86% rename from www/img/Teddybear/Teddy_klein/Teddybear.psd rename to _RemoveForDeployment_/Images/PSD/Teddybeargross.psd index 4c47f8a..bc17884 100644 Binary files a/www/img/Teddybear/Teddy_klein/Teddybear.psd and b/_RemoveForDeployment_/Images/PSD/Teddybeargross.psd differ diff --git a/_RemoveForDeployment_/Images/PSD/Teddybearklein.psd b/_RemoveForDeployment_/Images/PSD/Teddybearklein.psd new file mode 100644 index 0000000..bc17884 Binary files /dev/null and b/_RemoveForDeployment_/Images/PSD/Teddybearklein.psd differ diff --git a/www/img/Mentor/mentor.psd b/_RemoveForDeployment_/Images/PSD/mentor.psd similarity index 100% rename from www/img/Mentor/mentor.psd rename to _RemoveForDeployment_/Images/PSD/mentor.psd diff --git a/www/img/Mentor/mentor_bravo.psd b/_RemoveForDeployment_/Images/PSD/mentor_bravo.psd similarity index 100% rename from www/img/Mentor/mentor_bravo.psd rename to _RemoveForDeployment_/Images/PSD/mentor_bravo.psd diff --git a/_RemoveForDeployment_/Images/PSD/ufo.psd b/_RemoveForDeployment_/Images/PSD/ufo.psd new file mode 100644 index 0000000..859f6fe Binary files /dev/null and b/_RemoveForDeployment_/Images/PSD/ufo.psd differ diff --git a/www/img/Tiere/Affe.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Affe.svg similarity index 100% rename from www/img/Tiere/Affe.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Affe.svg diff --git a/www/img/Tiere/Esel.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Esel.svg similarity index 100% rename from www/img/Tiere/Esel.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Esel.svg diff --git a/www/img/Tiere/Hase.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Hase.svg similarity index 100% rename from www/img/Tiere/Hase.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Hase.svg diff --git a/www/img/Tiere/Hund.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Hund.svg similarity index 100% rename from www/img/Tiere/Hund.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Hund.svg diff --git a/www/img/Tiere/Kamel.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Kamel.svg similarity index 100% rename from www/img/Tiere/Kamel.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Kamel.svg diff --git a/www/img/Tiere/Katze.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Katze.svg similarity index 100% rename from www/img/Tiere/Katze.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Katze.svg diff --git a/www/img/Tiere/Krokodil.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Krokodil.svg similarity index 100% rename from www/img/Tiere/Krokodil.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Krokodil.svg diff --git a/www/img/Tiere/Kuh.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Kuh.svg similarity index 100% rename from www/img/Tiere/Kuh.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Kuh.svg diff --git a/www/img/Tiere/Loewe.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Loewe.svg similarity index 100% rename from www/img/Tiere/Loewe.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Loewe.svg diff --git a/www/img/Tiere/Maus.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Maus.svg similarity index 100% rename from www/img/Tiere/Maus.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Maus.svg diff --git a/www/img/Tiere/Nashorn.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Nashorn.svg similarity index 100% rename from www/img/Tiere/Nashorn.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Nashorn.svg diff --git a/www/img/Tiere/Nilpferd.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Nilpferd.svg similarity index 100% rename from www/img/Tiere/Nilpferd.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Nilpferd.svg diff --git a/www/img/Tiere/Schaf.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Schaf.svg similarity index 100% rename from www/img/Tiere/Schaf.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Schaf.svg diff --git a/www/img/Tiere/Schildkroete.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Schildkroete.svg similarity index 100% rename from www/img/Tiere/Schildkroete.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Schildkroete.svg diff --git a/www/img/Tiere/Schwein.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Schwein.svg similarity index 100% rename from www/img/Tiere/Schwein.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Schwein.svg diff --git a/www/img/Tiere/Stier.svg b/_RemoveForDeployment_/Images/SVG/Spielset1/Stier.svg similarity index 100% rename from www/img/Tiere/Stier.svg rename to _RemoveForDeployment_/Images/SVG/Spielset1/Stier.svg diff --git a/www/img/Teddybear/Teddy1.svg b/_RemoveForDeployment_/Images/SVG/Teddybear/Teddy1.svg similarity index 100% rename from www/img/Teddybear/Teddy1.svg rename to _RemoveForDeployment_/Images/SVG/Teddybear/Teddy1.svg diff --git a/www/img/Teddybear/Teddy2.svg b/_RemoveForDeployment_/Images/SVG/Teddybear/Teddy2.svg similarity index 100% rename from www/img/Teddybear/Teddy2.svg rename to _RemoveForDeployment_/Images/SVG/Teddybear/Teddy2.svg diff --git a/www/img/Teddybear/Teddy3.svg b/_RemoveForDeployment_/Images/SVG/Teddybear/Teddy3.svg similarity index 100% rename from www/img/Teddybear/Teddy3.svg rename to _RemoveForDeployment_/Images/SVG/Teddybear/Teddy3.svg diff --git a/www/img/Teddybear/Teddy4.svg b/_RemoveForDeployment_/Images/SVG/Teddybear/Teddy4.svg similarity index 100% rename from www/img/Teddybear/Teddy4.svg rename to _RemoveForDeployment_/Images/SVG/Teddybear/Teddy4.svg diff --git a/www/img/Teddybear/Teddy5.svg b/_RemoveForDeployment_/Images/SVG/Teddybear/Teddy5.svg similarity index 100% rename from www/img/Teddybear/Teddy5.svg rename to _RemoveForDeployment_/Images/SVG/Teddybear/Teddy5.svg diff --git a/www/img/Teddybear/Teddy6.svg b/_RemoveForDeployment_/Images/SVG/Teddybear/Teddy6.svg similarity index 100% rename from www/img/Teddybear/Teddy6.svg rename to _RemoveForDeployment_/Images/SVG/Teddybear/Teddy6.svg diff --git a/www/img/Teddybear/Teddy7.svg b/_RemoveForDeployment_/Images/SVG/Teddybear/Teddy7.svg similarity index 100% rename from www/img/Teddybear/Teddy7.svg rename to _RemoveForDeployment_/Images/SVG/Teddybear/Teddy7.svg diff --git a/www/img/Teddybear/Teddy8.svg b/_RemoveForDeployment_/Images/SVG/Teddybear/Teddy8.svg similarity index 100% rename from www/img/Teddybear/Teddy8.svg rename to _RemoveForDeployment_/Images/SVG/Teddybear/Teddy8.svg diff --git a/www/sounds/TORN.MID b/_RemoveForDeployment_/Sounds/Background_Musik/TORN.MID similarity index 100% rename from www/sounds/TORN.MID rename to _RemoveForDeployment_/Sounds/Background_Musik/TORN.MID diff --git a/www/sounds/background/backgound1.mid b/_RemoveForDeployment_/Sounds/Background_Musik/backgound1.mid similarity index 100% rename from www/sounds/background/backgound1.mid rename to _RemoveForDeployment_/Sounds/Background_Musik/backgound1.mid diff --git a/www/sounds/background/backgound2.mid b/_RemoveForDeployment_/Sounds/Background_Musik/backgound2.mid similarity index 100% rename from www/sounds/background/backgound2.mid rename to _RemoveForDeployment_/Sounds/Background_Musik/backgound2.mid diff --git a/www/sounds/background/backgound3.mid b/_RemoveForDeployment_/Sounds/Background_Musik/backgound3.mid similarity index 100% rename from www/sounds/background/backgound3.mid rename to _RemoveForDeployment_/Sounds/Background_Musik/backgound3.mid diff --git a/www/sounds/hintergrundmusik.mp3 b/_RemoveForDeployment_/Sounds/Background_Musik/hintergrundmusik.mp3 similarity index 100% rename from www/sounds/hintergrundmusik.mp3 rename to _RemoveForDeployment_/Sounds/Background_Musik/hintergrundmusik.mp3 diff --git a/www/sounds/hintergrundmusik1.mp3 b/_RemoveForDeployment_/Sounds/Background_Musik/hintergrundmusik1.mp3 similarity index 100% rename from www/sounds/hintergrundmusik1.mp3 rename to _RemoveForDeployment_/Sounds/Background_Musik/hintergrundmusik1.mp3 diff --git a/www/sounds/minispiel/geschafft.wav b/_RemoveForDeployment_/Sounds/Minispiel/geschafft.wav similarity index 100% rename from www/sounds/minispiel/geschafft.wav rename to _RemoveForDeployment_/Sounds/Minispiel/geschafft.wav diff --git a/www/sounds/minispiel/kitzeldenbaeren.wav b/_RemoveForDeployment_/Sounds/Minispiel/kitzeldenbaeren.wav similarity index 100% rename from www/sounds/minispiel/kitzeldenbaeren.wav rename to _RemoveForDeployment_/Sounds/Minispiel/kitzeldenbaeren.wav diff --git a/www/sounds/minispiel/lachen1.wav b/_RemoveForDeployment_/Sounds/Minispiel/lachen1.wav similarity index 100% rename from www/sounds/minispiel/lachen1.wav rename to _RemoveForDeployment_/Sounds/Minispiel/lachen1.wav diff --git a/www/sounds/minispiel/lachen2.wav b/_RemoveForDeployment_/Sounds/Minispiel/lachen2.wav similarity index 100% rename from www/sounds/minispiel/lachen2.wav rename to _RemoveForDeployment_/Sounds/Minispiel/lachen2.wav diff --git a/www/sounds/SekundenTimer.mp3 b/_RemoveForDeployment_/Sounds/SekundenTimer.mp3 similarity index 100% rename from www/sounds/SekundenTimer.mp3 rename to _RemoveForDeployment_/Sounds/SekundenTimer.mp3 diff --git a/www/sounds/bravo.mp3 b/_RemoveForDeployment_/Sounds/bravo.mp3 similarity index 100% rename from www/sounds/bravo.mp3 rename to _RemoveForDeployment_/Sounds/bravo.mp3 diff --git a/www/sounds/falsch.mp3 b/_RemoveForDeployment_/Sounds/falsch.mp3 similarity index 100% rename from www/sounds/falsch.mp3 rename to _RemoveForDeployment_/Sounds/falsch.mp3 diff --git a/www/sounds/finde_elefant.mp3 b/_RemoveForDeployment_/Sounds/finde_elefant.mp3 similarity index 100% rename from www/sounds/finde_elefant.mp3 rename to _RemoveForDeployment_/Sounds/finde_elefant.mp3 diff --git a/www/sounds/finde_esel.mp3 b/_RemoveForDeployment_/Sounds/finde_esel.mp3 similarity index 100% rename from www/sounds/finde_esel.mp3 rename to _RemoveForDeployment_/Sounds/finde_esel.mp3 diff --git a/www/sounds/finde_hahn.mp3 b/_RemoveForDeployment_/Sounds/finde_hahn.mp3 similarity index 100% rename from www/sounds/finde_hahn.mp3 rename to _RemoveForDeployment_/Sounds/finde_hahn.mp3 diff --git a/www/sounds/finde_hund.mp3 b/_RemoveForDeployment_/Sounds/finde_hund.mp3 similarity index 100% rename from www/sounds/finde_hund.mp3 rename to _RemoveForDeployment_/Sounds/finde_hund.mp3 diff --git a/www/sounds/finde_katze.mp3 b/_RemoveForDeployment_/Sounds/finde_katze.mp3 similarity index 100% rename from www/sounds/finde_katze.mp3 rename to _RemoveForDeployment_/Sounds/finde_katze.mp3 diff --git a/www/sounds/finde_kuh.mp3 b/_RemoveForDeployment_/Sounds/finde_kuh.mp3 similarity index 100% rename from www/sounds/finde_kuh.mp3 rename to _RemoveForDeployment_/Sounds/finde_kuh.mp3 diff --git a/www/sounds/finde_maus.mp3 b/_RemoveForDeployment_/Sounds/finde_maus.mp3 similarity index 100% rename from www/sounds/finde_maus.mp3 rename to _RemoveForDeployment_/Sounds/finde_maus.mp3 diff --git a/www/sounds/finde_schaf.mp3 b/_RemoveForDeployment_/Sounds/finde_schaf.mp3 similarity index 100% rename from www/sounds/finde_schaf.mp3 rename to _RemoveForDeployment_/Sounds/finde_schaf.mp3 diff --git a/www/sounds/sound_elefant.mp3 b/_RemoveForDeployment_/Sounds/sound_elefant.mp3 similarity index 100% rename from www/sounds/sound_elefant.mp3 rename to _RemoveForDeployment_/Sounds/sound_elefant.mp3 diff --git a/www/sounds/sound_esel.mp3 b/_RemoveForDeployment_/Sounds/sound_esel.mp3 similarity index 100% rename from www/sounds/sound_esel.mp3 rename to _RemoveForDeployment_/Sounds/sound_esel.mp3 diff --git a/www/sounds/sound_hahn.mp3 b/_RemoveForDeployment_/Sounds/sound_hahn.mp3 similarity index 100% rename from www/sounds/sound_hahn.mp3 rename to _RemoveForDeployment_/Sounds/sound_hahn.mp3 diff --git a/www/sounds/sound_hund.mp3 b/_RemoveForDeployment_/Sounds/sound_hund.mp3 similarity index 100% rename from www/sounds/sound_hund.mp3 rename to _RemoveForDeployment_/Sounds/sound_hund.mp3 diff --git a/www/sounds/sound_katze.mp3 b/_RemoveForDeployment_/Sounds/sound_katze.mp3 similarity index 100% rename from www/sounds/sound_katze.mp3 rename to _RemoveForDeployment_/Sounds/sound_katze.mp3 diff --git a/www/sounds/sound_kuh.mp3 b/_RemoveForDeployment_/Sounds/sound_kuh.mp3 similarity index 100% rename from www/sounds/sound_kuh.mp3 rename to _RemoveForDeployment_/Sounds/sound_kuh.mp3 diff --git a/www/sounds/sound_maus.mp3 b/_RemoveForDeployment_/Sounds/sound_maus.mp3 similarity index 100% rename from www/sounds/sound_maus.mp3 rename to _RemoveForDeployment_/Sounds/sound_maus.mp3 diff --git a/www/sounds/sound_schaf.mp3 b/_RemoveForDeployment_/Sounds/sound_schaf.mp3 similarity index 100% rename from www/sounds/sound_schaf.mp3 rename to _RemoveForDeployment_/Sounds/sound_schaf.mp3 diff --git a/www/sounds/spiel1.mp3 b/_RemoveForDeployment_/Sounds/spiel1.mp3 similarity index 100% rename from www/sounds/spiel1.mp3 rename to _RemoveForDeployment_/Sounds/spiel1.mp3 diff --git a/www/sounds/spiel2.mp3 b/_RemoveForDeployment_/Sounds/spiel2.mp3 similarity index 100% rename from www/sounds/spiel2.mp3 rename to _RemoveForDeployment_/Sounds/spiel2.mp3 diff --git a/www/sounds/squirrel/133034_321967-lq.mp3 b/_RemoveForDeployment_/Sounds/squirrel/133034_321967-lq.mp3 similarity index 100% rename from www/sounds/squirrel/133034_321967-lq.mp3 rename to _RemoveForDeployment_/Sounds/squirrel/133034_321967-lq.mp3 diff --git a/www/sounds/squirrel/188438_3399958-lq.mp3 b/_RemoveForDeployment_/Sounds/squirrel/188438_3399958-lq.mp3 similarity index 100% rename from www/sounds/squirrel/188438_3399958-lq.mp3 rename to _RemoveForDeployment_/Sounds/squirrel/188438_3399958-lq.mp3 diff --git a/www/sounds/squirrel/202305_3184722-lq.mp3 b/_RemoveForDeployment_/Sounds/squirrel/202305_3184722-lq.mp3 similarity index 100% rename from www/sounds/squirrel/202305_3184722-lq.mp3 rename to _RemoveForDeployment_/Sounds/squirrel/202305_3184722-lq.mp3 diff --git a/www/sounds/squirrel/259172_4157918-lq.mp3 b/_RemoveForDeployment_/Sounds/squirrel/259172_4157918-lq.mp3 similarity index 100% rename from www/sounds/squirrel/259172_4157918-lq.mp3 rename to _RemoveForDeployment_/Sounds/squirrel/259172_4157918-lq.mp3 diff --git a/www/sounds/suchspiel.mp3 b/_RemoveForDeployment_/Sounds/suchspiel.mp3 similarity index 100% rename from www/sounds/suchspiel.mp3 rename to _RemoveForDeployment_/Sounds/suchspiel.mp3 diff --git a/www/sounds/willst_du_spielen.mp3 b/_RemoveForDeployment_/Sounds/willst_du_spielen.mp3 similarity index 100% rename from www/sounds/willst_du_spielen.mp3 rename to _RemoveForDeployment_/Sounds/willst_du_spielen.mp3 diff --git a/www/js/home_controller.js b/www/js/home_controller.js index ec3f4ea..f6ea861 100644 --- a/www/js/home_controller.js +++ b/www/js/home_controller.js @@ -1,4 +1,4 @@ -appControllers.controller('home', function($scope, $ionicPlatform, $cordovaMedia, $state, backgroundsounds_mediahandler, $timeout ) { +appControllers.controller('home', function($scope, $ionicPlatform, $cordovaMedia, $state, backgroundsounds_mediahandler, $timeout, $http ) { /* * Mentor-Anitmation ausschalten @@ -9,45 +9,60 @@ appControllers.controller('home', function($scope, $ionicPlatform, $cordovaMedia $scope.CSSWindrad=false; $scope.CSSKornspeicher=false; $scope.baumhauszufallaction=99; + /* * Hintergrundmusik laden und starten */ $ionicPlatform.ready(function() { + //Globale-Sounddatei + var gamesound=''; $scope.baumhaus_action=[]; + $scope.mediastartesuchspiel=''; - var mediastartesuchspiel = new Media('/android_asset/www/sounds/soundsneu/spiel_intro.mp3', suchspiel_intro_finish,null); + /* + * Spiele IntroSounds laden + */ + $http.get('spielsets/introsounds.json').success(function(data) { - var baumhaus_action1 = new Media('/android_asset/www/sounds/soundsneu/baumhaus_action_1.mp3', baumhaus_mentor,null); - var baumhaus_action2 = new Media('/android_asset/www/sounds/soundsneu/baumhaus_action_2.mp3', baumhaus_mentor,null); - var baumhaus_action3 = new Media('/android_asset/www/sounds/soundsneu/baumhaus_action_3.mp3', baumhaus_mentor,null); - var baumhaus_action4 = new Media('/android_asset/www/sounds/soundsneu/baumhaus_action_4.mp3', baumhaus_mentor,null); + for(var i = 0; i < data.length; i++) { + + if (data[i].type=='baumhaus'){ + $scope.baumhaus_action.push(data[i].sound); + } + else if (data[i].type=='startgamesuchspiel'){ + $scope.mediastartesuchspiel=data[i].sound; + } + else if (data[i].type=='backgroundmusic'){ + backgroundsounds_mediahandler.setbackgroundsoundfile(data[i].sound); + backgroundsounds_mediahandler.playbackgroundmusic(); + } - $scope.mediastartesuchspiel=mediastartesuchspiel; - backgroundsounds_mediahandler.playbackgroundmusic(); + }//for-Schleife - $scope.baumhaus_action.push(baumhaus_action1); - $scope.baumhaus_action.push(baumhaus_action2); - $scope.baumhaus_action.push(baumhaus_action3); - $scope.baumhaus_action.push(baumhaus_action4); - }); + + });//$http + + });//$ionicPlatform /* * Suchspiel wurde angeklickt, Sound abspielen, Mentor-Animation starten */ $scope.suchspiel_intro = function(){ - $scope.CSSKlickSuchspiel=true; + $scope.CSSKlickSuchspiel=true; $scope.showmentor=true; - $scope.mediastartesuchspiel.play(); - $scope.mediastartesuchspiel.setVolume('1.0'); + playsound($scope.mediastartesuchspiel, suchspiel_intro_finish,'1.0'); } /* * Suchspiel Sound ist beendet, Mentor-Animation ausschalten, Suchspiel starten */ function suchspiel_intro_finish() { + + //Soundfile freigeben + gamesound.release(); + $scope.CSSKlickSuchspiel=false; - $scope.mediastartesuchspiel.release(); $scope.showmentor=false; $state.go('suchspiel'); } @@ -56,7 +71,7 @@ appControllers.controller('home', function($scope, $ionicPlatform, $cordovaMedia $scope.CSSFarmhaus=true; $timeout(function () { $scope.CSSFarmhaus=false; - }, 5000); + }, 2000); } @@ -64,7 +79,7 @@ appControllers.controller('home', function($scope, $ionicPlatform, $cordovaMedia $scope.CSSWindrad=true; $timeout(function () { $scope.CSSWindrad=false; - }, 5000); + }, 2000); } @@ -72,23 +87,38 @@ appControllers.controller('home', function($scope, $ionicPlatform, $cordovaMedia $scope.CSSKornspeicher=true; $timeout(function () { $scope.CSSKornspeicher=false; - }, 5000); + }, 2000); } $scope.baumhaus_actiondo=function(){ - $scope.baumhauszufallaction=getRandomInt(1,5); - if ($scope.baumhauszufallaction==3){ + $scope.baumhauszufallaction=getRandomInt(1,2); + if ($scope.baumhauszufallaction==2){ $scope.showmentor=true; - $scope.baumhaus_action[getRandomInt(0,3)].play(); - $scope.mediastartesuchspiel.setVolume('1.0'); + playsound($scope.baumhaus_action[getRandomInt(0, $scope.baumhaus_action.length - 1)], baumhaus_mentor,'1.0'); } } + /* + * Play-Sound + */ + function playsound(soundfile, callbackfunction, volume){ + + $ionicPlatform.ready(function() { + gamesound = new Media(soundfile, callbackfunction ,null); + gamesound.play(); + gamesound.setVolume(volume); + }); + + } function baumhaus_mentor(){ - $timeout(function () { - $scope.showmentor=false; + //Soundfile freigeben + gamesound.release(); + + //Baumhausmentor ausblenden + $timeout(function () { + $scope.showmentor=false; }, 0); } diff --git a/www/js/services.js b/www/js/services.js index dc58f5a..82eacba 100644 --- a/www/js/services.js +++ b/www/js/services.js @@ -11,8 +11,12 @@ angular.module('kinderspiel.services', []) * Soundfiles Variablen */ var backgroundmusic=''; + + var backgroundmusicsoundfile=''; + $ionicPlatform.ready(function() { - var mybackground_music = new Media('/android_asset/www/sounds/background/backgound4.mid', loopbackgroundmusic ,null); + backgroundmusicsoundfile='/android_asset/www/sounds/background/background4.mid'; + var mybackground_music = new Media(backgroundmusicsoundfile, loopbackgroundmusic ,null); backgroundmusic=mybackground_music; }); @@ -34,6 +38,15 @@ angular.module('kinderspiel.services', []) backgroundmusic.setVolume('0.3'); } }, + setbackgroundsoundfile: function(soundfile) { + $ionicPlatform.ready(function() { + backgroundmusicsoundfile=soundfile; + backgroundmusic.release(); + var mybackground_music = new Media(backgroundmusicsoundfile, loopbackgroundmusic ,null); + backgroundmusic=mybackground_music; + mybackground_music.release(); + }); + }, stopbackgroundmusic: function() { backgroundmusic.stop(); }, diff --git a/www/js/suchspiel_controller.js b/www/js/suchspiel_controller.js index 4496ca7..bfbf75a 100644 --- a/www/js/suchspiel_controller.js +++ b/www/js/suchspiel_controller.js @@ -1,4 +1,4 @@ -appControllers.controller('Suchspiel', function($scope, $ionicPlatform, $cordovaMedia, $state, $timeout,$q) { +appControllers.controller('Suchspiel', function($scope, $ionicPlatform, $cordovaMedia, backgroundsounds_mediahandler, $state, $timeout,$q, $http) { /* @@ -44,6 +44,9 @@ $scope.punkte=0; $scope.punktebonus=0; +//Spiele sperren bis alle Karten ausgegeben sind +$scope.gamelock=true; + //Zeitmessung für PunkteBonus $scope.rundenstart = ''; $scope.rundenende = ''; @@ -58,50 +61,65 @@ $ionicPlatform.ready(function() { /* * Sounds definieren */ - $scope.sounds=[]; + //Globale MediaVariable fure Soundeffekte + var gamesound=''; + var bravosound=''; + var falschsound=''; + $scope.bravosounds=[]; $scope.falschsounds=[]; $scope.aufloesung=''; - /* - * Sounds laden - */ - var tiersound1 = new Media('/android_asset/www/sounds/soundsneu/finde_affe.mp3', mentorausblenden,null); - var tiersound2 = new Media('/android_asset/www/sounds/soundsneu/finde_esel.mp3', mentorausblenden,null); - var tiersound3 = new Media('/android_asset/www/sounds/soundsneu/finde_hase.mp3', mentorausblenden,null); - var tiersound4 = new Media('/android_asset/www/sounds/soundsneu/finde_hund.mp3', mentorausblenden,null); - var tiersound5 = new Media('/android_asset/www/sounds/soundsneu/finde_kamel.mp3', mentorausblenden,null); - var tiersound6 = new Media('/android_asset/www/sounds/soundsneu/finde_katze.mp3', mentorausblenden,null); - var tiersound7 = new Media('/android_asset/www/sounds/soundsneu/finde_krokodil.mp3', mentorausblenden,null); - var tiersound8 = new Media('/android_asset/www/sounds/soundsneu/finde_kuh.mp3', mentorausblenden,null); - var tiersound9 = new Media('/android_asset/www/sounds/soundsneu/finde_loewe.mp3', mentorausblenden,null); - var tiersound10 = new Media('/android_asset/www/sounds/soundsneu/finde_maus.mp3', mentorausblenden,null); - var tiersound11 = new Media('/android_asset/www/sounds/soundsneu/finde_nashorn.mp3', mentorausblenden,null); - var tiersound12 = new Media('/android_asset/www/sounds/soundsneu/finde_nilpferd.mp3', mentorausblenden,null); - var tiersound13 = new Media('/android_asset/www/sounds/soundsneu/finde_schaf.mp3', mentorausblenden,null); - var tiersound14 = new Media('/android_asset/www/sounds/soundsneu/finde_schildkroete.mp3', mentorausblenden,null); - var tiersound15 = new Media('/android_asset/www/sounds/soundsneu/finde_schwein.mp3', mentorausblenden,null); - var tiersound16 = new Media('/android_asset/www/sounds/soundsneu/finde_stier.mp3', mentorausblenden,null); - - var bravosound1 = new Media('/android_asset/www/sounds/soundsneu/erfolg_1.mp3', karteausblenden,null); - var bravosound2 = new Media('/android_asset/www/sounds/soundsneu/erfolg_2.mp3', karteausblenden,null); - var bravosound3 = new Media('/android_asset/www/sounds/soundsneu/erfolg_3.mp3', karteausblenden,null); - var bravosound4 = new Media('/android_asset/www/sounds/soundsneu/erfolg_4.mp3', karteausblenden,null); - var bravosound5 = new Media('/android_asset/www/sounds/soundsneu/erfolg_5.mp3', karteausblenden,null); - - - var falschsound1 = new Media('/android_asset/www/sounds/soundsneu/niederlage_1.mp3', mentorausblenden,null); - var falschsound2 = new Media('/android_asset/www/sounds/soundsneu/niederlage_2.mp3', mentorausblenden,null); - var falschsound3 = new Media('/android_asset/www/sounds/soundsneu/niederlage_3.mp3', mentorausblenden,null); - var falschsound4 = new Media('/android_asset/www/sounds/soundsneu/niederlage_4.mp3', mentorausblenden,null); - var falschsound5 = new Media('/android_asset/www/sounds/soundsneu/niederlage_5.mp3', mentorausblenden,null); - - var kartegebensound = new Media('/android_asset/www/sounds/karte.mp3', kartegeben,null); - var aufloesungsound = new Media('/android_asset/www/sounds/soundsneu/aufloesung.mp3', aufloesung,null); /* - * Spielende - Minispiel + * Spielset laden + */ + $http.get('spielsets/spielset1/spielset.json').success(function(data) { + //console.log(data); + $scope.spielealletiere = data; + }); + + + + /* + * Spiele IntroSounds laden + * Typen: successsound -> Bravo, super, tollgemacht Sounds + * Typen: failuresound -> Leider daneben, versuchs nochmal + * Typen: cardsound -> Kartenlegegeräusch + * Typen: solutionsound -> Auflösungsgeräusch, das wäre das Tier gewesen + * Typen: gameoversound -> Spielzu ende Zeit für minispiel etc. + * Typen: backgroundmusic -> Hintergrundmusik + */ + $http.get('spielsets/spielset1/systemsounds.json').success(function(data) { + + for(var i = 0; i < data.length; i++) { + + if (data[i].type=='successsound'){ + $scope.bravosounds.push(data[i].sound); + } + else if (data[i].type=='failuresound'){ + $scope.falschsounds.push(data[i].sound); + } + else if (data[i].type=='cardsound'){ + $scope.kartegebensound=data[i].sound; + } + else if (data[i].type=='solutionsound'){ + $scope.aufloesung=data[i].sound; + } + else if (data[i].type=='gameoversound'){ + $scope.spielendesound=data[i].sound; + } + else if (data[i].type=='backgroundmusic'){ + backgroundsounds_mediahandler.setbackgroundsoundfile(data[i].sound); + backgroundsounds_mediahandler.playbackgroundmusic(); + } + + }//for-Schleife + + });//$http + + /* + * Minispiel */ - var spielendesound = new Media('/android_asset/www/sounds/minispiel/geschafft.mp3', minispielintro,null); var minispielsound = new Media('/android_asset/www/sounds/minispiel/kitzeldenbaeren.mp3', minispielstart,null); var minispielsound1 = new Media('/android_asset/www/sounds/minispiel/lachen1.mp3', null,null); var minispielsound2 = new Media('/android_asset/www/sounds/minispiel/lachen2.mp3', null,null); @@ -110,222 +128,82 @@ $ionicPlatform.ready(function() { /* * Sounds in $Scope referenzieren */ - $scope.kartegebensound=kartegebensound; - $scope.aufloesung=aufloesungsound; - - $scope.spielendesound=spielendesound; $scope.minispielsound=minispielsound; $scope.minispielsound1=minispielsound1; $scope.minispielsound2=minispielsound2; - $scope.bravosounds.push(bravosound1); - $scope.bravosounds.push(bravosound2); - $scope.bravosounds.push(bravosound3); - $scope.bravosounds.push(bravosound4); - $scope.bravosounds.push(bravosound5); - - - $scope.falschsounds.push(falschsound1); - $scope.falschsounds.push(falschsound2); - $scope.falschsounds.push(falschsound3); - $scope.falschsounds.push(falschsound4); - $scope.falschsounds.push(falschsound5); - - -/* -* Tiere definieren -*/ -var tier = { - id: 0, - bild: 'Affe.png', - sound1: tiersound1, - display: false, - einblendecssid: 'affeein', - ausblendecssid: 'affeaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier); - - -var tier1 = { - id: 1, - bild: 'Esel.png', - sound1: tiersound2, - display: false, - einblendecssid: 'eselein', - ausblendecssid: 'eselaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier1); - - -var tier2 = { - id: 2, - bild: 'Hase.png', - sound1: tiersound3, - display: false, - einblendecssid: 'haseein', - ausblendecssid: 'haseaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier2); - - -var tier3 = { - id: 3, - bild: 'Hund.png', - sound1: tiersound4, - display: false, - einblendecssid: 'hundein', - ausblendecssid: 'hundaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier3); - - -var tier4 = { - id: 4, - bild: 'Kamel.png', - sound1: tiersound5, - display: false, - einblendecssid: 'kamelein', - ausblendecssid: 'kamelaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier4); - - -var tier5 = { - id: 5, - bild: 'Katze.png', - sound1: tiersound6, - display: false, - einblendecssid: 'katzeein', - ausblendecssid: 'katzeaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier5); - - -var tier6 = { - id: 6, - bild: 'Krokodil.png', - sound1: tiersound7, - display: false, - einblendecssid: 'krokodilein', - ausblendecssid: 'krokodilaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier6); - - -var tier7 = { - id: 7, - bild: 'Kuh.png', - sound1: tiersound8, - display: false, - einblendecssid: 'kuhein', - ausblendecssid: 'kuhaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier7); - - -var tier8 = { - id: 8, - bild: 'Loewe.png', - sound1: tiersound9, - display: false, - einblendecssid: 'loeweein', - ausblendecssid: 'loeweaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier8); - -var tier9 = { - id: 9, - bild: 'Maus.png', - sound1: tiersound10, - display: false, - einblendecssid: 'mausein', - ausblendecssid: 'mausaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier9); - -var tier10 = { - id: 10, - bild: 'Nashorn.png', - sound1: tiersound11, - display: false, - einblendecssid: 'nashornein', - ausblendecssid: 'nashornaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier10); - -var tier11 = { - id: 11, - bild: 'Nilpferd.png', - sound1: tiersound12, - display: false, - einblendecssid: 'nilpferdein', - ausblendecssid: 'nilpferdaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier11); - -var tier12 = { - id: 12, - bild: 'Schaf.png', - sound1: tiersound13, - display: false, - einblendecssid: 'schafein', - ausblendecssid: 'schafaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier12); - -var tier13 = { - id: 13, - bild: 'Schildkroete.png', - sound1: tiersound14, - display: false, - einblendecssid: 'schildkroeteein', - ausblendecssid: 'schildkroeteaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier13); - - -var tier14 = { - id: 14, - bild: 'Schwein.png', - sound1: tiersound15, - display: false, - einblendecssid: 'schweinein', - ausblendecssid: 'schweinaus', - sortid: 0 -}; -$scope.spielealletiere.push(tier14); - - -var tier15 = { - id: 15, - bild: 'Stier.png', - sound1: tiersound16, - display: false, - einblendecssid: 'stierein', - ausblendecssid: 'stieraus', - sortid: 0 -}; -$scope.spielealletiere.push(tier15); - - - }); +/* +* Play-Sound +* playtype-> Bravo,Falsch oder Gamesound +* soundfile-> Pfad zur sounddatei +* callbackfunction-> Funktion die nach erfolgreichem abspielen gestarte wird +* volume-> Lautstärke z.B. 1.0 +*/ +function playsound(playtype, soundfile, callbackfunction, volume){ + $ionicPlatform.ready(function() { + + if (playtype=='bravosound'){ + + try{ + + //versuchen Soundfile freizugeben + bravosound.release(); + + } + catch(e){ + + //Soundfile Objekt gabs nicht oder Freigabefehler + console.log("Sounddatei nicht da"); + } + + bravosound = new Media(soundfile, callbackfunction ,null); + bravosound.play(); + + } + else if (playtype=='falschsound'){ + + try{ + + //versuchen Soundfile freizugeben + falschsound.release(); + + } + catch(e){ + + //Soundfile Objekt gabs nicht oder Freigabefehler + console.log("Sounddatei nicht da"); + } + + falschsound = new Media(soundfile, callbackfunction ,null); + falschsound.play(); + + + } + else if (playtype=='gamesound'){ + + try{ + + //versuchen Soundfile freizugeben + gamesound.release(); + + } + catch(e){ + + //Soundfile Objekt gabs nicht oder Freigabefehler + console.log("Sounddatei nicht da"); + } + + gamesound = new Media(soundfile, callbackfunction ,null); + gamesound.play(); + + } + + }); + +} /* @@ -334,7 +212,7 @@ $scope.spielealletiere.push(tier15); $scope.hilfe = function() { console.log("Hilfe geklickt"); $scope.showmentor=true; - $scope.spiele[$scope.randomid].sound1.play(); + playsound('gamesound', $scope.spiele[$scope.randomid].sound, mentorausblenden,'1.0'); } @@ -343,7 +221,6 @@ $scope.hilfe = function() { */ function mentorausblenden(){ $timeout(function () { $scope.showmentor=false; $scope.cardindex=0}, 10); - } @@ -352,77 +229,94 @@ function mentorausblenden(){ */ $scope.PlayerAnswer = function(src) { - /* - * Einblende-effekte zurücksetzen - */ - $scope.CSSEinblendung=''; + if ($scope.gamelock==false){ - /* - * Prüfen ob schon einmal geklickt wurde - */ - if ($scope.beantwortet==false){ /* - * Antwort ist richtig + * Einblende-effekte zurücksetzen */ - $scope.beantwortet=true; - if (src==$scope.randomid){ - $timeout(function () { - $scope.punkte=$scope.punkte + 1000; - $scope.rundenende = new Date().getTime(); - //Zeitbonus - $scope.punktebonus=1000 / (($scope.rundenende - $scope.rundenstart)/1000); - console.log($scope.rundenende - $scope.rundenstart + " Start:" + $scope.rundenstart + " Ende:" + $scope.rundenende); - $scope.punktebonus=Math.round($scope.punktebonus); + $scope.CSSEinblendung=''; - $scope.punkte = $scope.punkte + $scope.punktebonus; + /* + * Prüfen ob schon einmal geklickt wurde + */ + if ($scope.beantwortet==false){ - $scope.randomMentor=getRandomInt(1, 2); - if ($scope.randomMentor==2){ - $scope.showmentorbravo=true; - } - else{ - $scope.showmentor=true; - } - - $scope.cardindex=0; - }, 0); - $scope.bravosounds[getRandomInt(0, 4)].play(); - } - else{ - /* - * Antwort war dreimal falsch + * Antwort ist richtig */ - if ($scope.falscheantwort==2){ + $scope.beantwortet=true; + if (src==$scope.randomid){ + + $timeout(function () { + $scope.punkte=$scope.punkte + 1000; + $scope.rundenende = new Date().getTime(); + + //Zeitbonus + $scope.punktebonus=1000 / (($scope.rundenende - $scope.rundenstart)/1000); + console.log($scope.rundenende - $scope.rundenstart + " Start:" + $scope.rundenstart + " Ende:" + $scope.rundenende); + $scope.punktebonus=Math.round($scope.punktebonus); - /* - * Richtige Karte pulsieren lassen - */ - $scope.CSSErrorCode=$scope.randomid; - $scope.CSSFalscheAntwort= false; - /* - * Nach 3 sekunden Fehler zurücksetzen und Karten neu vergeben - */ - $scope.showmentor=true; - $scope.aufloesung.play(); - } - else { - /* - * Antwort ist falsch - */ - $scope.showmentor=true; - $scope.falschsounds[getRandomInt(0, 4)].play(); - $scope.CSSFalscheAntwort = true; - $timeout(function () { - $scope.CSSFalscheAntwort = false; - $scope.beantwortet=false; - $scope.falscheantwort=$scope.falscheantwort + 1 - }, 1000); - } - } + $scope.punkte = $scope.punkte + $scope.punktebonus; - } + $scope.randomMentor=getRandomInt(1, 2); + + if ($scope.randomMentor==2){ + $scope.showmentorbravo=true; + } + else{ + $scope.showmentor=true; + } + + $scope.cardindex=0; + + }, 0);//$timeoutfunction + + /* + * Zufällig einen Bravosound wiedergeben lassen aus Bravosound-Array + */ + playsound('bravosound', $scope.bravosounds[getRandomInt(0, $scope.bravosounds.length - 1)], karteausblenden,'1.0'); + + }//If Abfrage ob antowrt richtig + else{ + + /* + * Antwort war dreimal falsch + */ + if ($scope.falscheantwort==2){ + + /* + * Richtige Karte pulsieren lassen + */ + $scope.CSSErrorCode=$scope.randomid; + $scope.CSSFalscheAntwort= false; + $scope.showmentor=true; + + //Auflösungssound wiedergeben + playsound('gamesound', $scope.aufloesung, aufloesung, '1.0'); + }//If Abfrage ob antowrt 3x falsch war + else { + /* + * Antwort ist falsch + */ + $scope.showmentor=true; + + /* + * Zufällig einen Falschsound wiedergeben lassen aus Falschsound-Array + */ + playsound('falschsound', $scope.falschsounds[getRandomInt(0, $scope.falschsounds.length - 1)], mentorausblenden,'1.0'); + + $scope.CSSFalscheAntwort = true; + + $timeout(function () { + $scope.CSSFalscheAntwort = false; + $scope.beantwortet=false; + $scope.falscheantwort=$scope.falscheantwort + 1 + }, 1000); //$timeoutfunction + }//Else Abfrage ob antowrt 3x falsch war + }//Else Abfrage ob antowrt richtig + }//IFAbfrage ob Frage beantwortet wurde + }//Ifabfrage obSpielsperre aktiv ist } @@ -430,14 +324,14 @@ $scope.PlayerAnswer = function(src) { * Neues Spiel starten */ function goto_newspiel(){ + $scope.gamelock=true; $scope.CSSErrorCode=99; $scope.falscheantwort=0; $scope.CSSEinblendung=''; $scope.cardindex=0; kartenmischen(); - - //$timeout(function () { $scope.kartegebensound.play(); }, 2000); + kartegeben(); } @@ -446,6 +340,7 @@ function goto_newspiel(){ * Karten austeilen */ function kartegeben(){ + $timeout(function () { $scope.spielelistensort[$scope.cardindex].display=true; @@ -462,24 +357,24 @@ function kartegeben(){ * Interner Zähler bis alle Karten gegeben wurden */ if ($scope.cardindex < 7 ){ - $scope.kartegebensound.play(); + playsound('gamesound', $scope.kartegebensound, kartegeben,'1.0'); } else{ $scope.CSSEinblendung=''; /* - * Zufallszahl 3x mal generieren lassen, zufälliger + * Zufallszahl generieren lassen */ $scope.randomid=getRandomInt(0, 7); - $scope.randomid=getRandomInt(0, 7); - $scope.randomid=getRandomInt(0, 7); - + //Spiel-Eingabesperre entfernen + $scope.gamelock=false; + //Zeit messen $scope.rundenstart = new Date().getTime(); /* * Mentor anzeigen und Sound wiedergeben */ $scope.showmentor=true; - $scope.spiele[$scope.randomid].sound1.play(); + playsound('gamesound', $scope.spiele[$scope.randomid].sound, mentorausblenden,'1.0'); console.log("ELSE-Zweig Einblende -ID: " + $scope.CSSEinblendung); console.log("CardIndex: " + $scope.cardindex); console.log("Zufallsid: " + $scope.randomid); @@ -492,6 +387,7 @@ function kartegeben(){ * Karten wieder einsammeln, runde beendet */ function karteausblenden(){ + $timeout(function () { $scope.showmentorbravo=false; $scope.showmentor=false;}, 0); if ($scope.spielvorbei==false){ @@ -535,7 +431,8 @@ function spielende(){ $timeout(function () { $scope.showmentorbravo=true; - $scope.spielendesound.play(); + //$scope.spielendesound.play(); + playsound('gamesound', $scope.spielendesound, minispielintro,'1.0'); }, 10); //$scope.showteddybear=true diff --git a/www/sounds/soundsneu/aufloesung.mp3 b/www/sounds/aufloesung.mp3 similarity index 100% rename from www/sounds/soundsneu/aufloesung.mp3 rename to www/sounds/aufloesung.mp3 diff --git a/www/sounds/background/backgound4.mid b/www/sounds/background/background4.mid similarity index 100% rename from www/sounds/background/backgound4.mid rename to www/sounds/background/background4.mid diff --git a/www/sounds/soundsneu/baumhaus_action_1.mp3 b/www/sounds/baumhaus_action_1.mp3 similarity index 100% rename from www/sounds/soundsneu/baumhaus_action_1.mp3 rename to www/sounds/baumhaus_action_1.mp3 diff --git a/www/sounds/soundsneu/baumhaus_action_2.mp3 b/www/sounds/baumhaus_action_2.mp3 similarity index 100% rename from www/sounds/soundsneu/baumhaus_action_2.mp3 rename to www/sounds/baumhaus_action_2.mp3 diff --git a/www/sounds/soundsneu/baumhaus_action_3.mp3 b/www/sounds/baumhaus_action_3.mp3 similarity index 100% rename from www/sounds/soundsneu/baumhaus_action_3.mp3 rename to www/sounds/baumhaus_action_3.mp3 diff --git a/www/sounds/soundsneu/baumhaus_action_4.mp3 b/www/sounds/baumhaus_action_4.mp3 similarity index 100% rename from www/sounds/soundsneu/baumhaus_action_4.mp3 rename to www/sounds/baumhaus_action_4.mp3 diff --git a/www/sounds/soundsneu/erfolg_1.mp3 b/www/sounds/erfolg_1.mp3 similarity index 100% rename from www/sounds/soundsneu/erfolg_1.mp3 rename to www/sounds/erfolg_1.mp3 diff --git a/www/sounds/soundsneu/erfolg_2.mp3 b/www/sounds/erfolg_2.mp3 similarity index 100% rename from www/sounds/soundsneu/erfolg_2.mp3 rename to www/sounds/erfolg_2.mp3 diff --git a/www/sounds/soundsneu/erfolg_3.mp3 b/www/sounds/erfolg_3.mp3 similarity index 100% rename from www/sounds/soundsneu/erfolg_3.mp3 rename to www/sounds/erfolg_3.mp3 diff --git a/www/sounds/soundsneu/erfolg_4.mp3 b/www/sounds/erfolg_4.mp3 similarity index 100% rename from www/sounds/soundsneu/erfolg_4.mp3 rename to www/sounds/erfolg_4.mp3 diff --git a/www/sounds/soundsneu/erfolg_5.mp3 b/www/sounds/erfolg_5.mp3 similarity index 100% rename from www/sounds/soundsneu/erfolg_5.mp3 rename to www/sounds/erfolg_5.mp3 diff --git a/www/sounds/soundsneu/niederlage_1.mp3 b/www/sounds/niederlage_1.mp3 similarity index 100% rename from www/sounds/soundsneu/niederlage_1.mp3 rename to www/sounds/niederlage_1.mp3 diff --git a/www/sounds/soundsneu/niederlage_2.mp3 b/www/sounds/niederlage_2.mp3 similarity index 100% rename from www/sounds/soundsneu/niederlage_2.mp3 rename to www/sounds/niederlage_2.mp3 diff --git a/www/sounds/soundsneu/niederlage_3.mp3 b/www/sounds/niederlage_3.mp3 similarity index 100% rename from www/sounds/soundsneu/niederlage_3.mp3 rename to www/sounds/niederlage_3.mp3 diff --git a/www/sounds/soundsneu/niederlage_4.mp3 b/www/sounds/niederlage_4.mp3 similarity index 100% rename from www/sounds/soundsneu/niederlage_4.mp3 rename to www/sounds/niederlage_4.mp3 diff --git a/www/sounds/soundsneu/niederlage_5.mp3 b/www/sounds/niederlage_5.mp3 similarity index 100% rename from www/sounds/soundsneu/niederlage_5.mp3 rename to www/sounds/niederlage_5.mp3 diff --git a/www/sounds/soundsneu/spiel_intro.mp3 b/www/sounds/spiel_intro.mp3 similarity index 100% rename from www/sounds/soundsneu/spiel_intro.mp3 rename to www/sounds/spiel_intro.mp3 diff --git a/www/spielsets/introsounds.json b/www/spielsets/introsounds.json new file mode 100644 index 0000000..49eea98 --- /dev/null +++ b/www/spielsets/introsounds.json @@ -0,0 +1,8 @@ +[ + {"id": 0, "type": "baumhaus", "sound": "/android_asset/www/sounds/baumhaus_action_1.mp3"}, + {"id": 1, "type": "baumhaus", "sound": "/android_asset/www/sounds/baumhaus_action_2.mp3"}, + {"id": 2, "type": "baumhaus", "sound": "/android_asset/www/sounds/baumhaus_action_3.mp3"}, + {"id": 3, "type": "baumhaus", "sound": "/android_asset/www/sounds/baumhaus_action_4.mp3"}, + {"id": 4, "type": "startgamesuchspiel", "sound": "/android_asset/www/sounds/spiel_intro.mp3"}, + {"id": 5, "type": "backgroundmusic", "sound": "/android_asset/www/sounds/background/background4.mid"} +] \ No newline at end of file diff --git a/www/spielsets/spielset1/images/Affe.png b/www/spielsets/spielset1/images/Affe.png new file mode 100644 index 0000000..b8ff90a Binary files /dev/null and b/www/spielsets/spielset1/images/Affe.png differ diff --git a/www/spielsets/spielset1/images/Esel.png b/www/spielsets/spielset1/images/Esel.png new file mode 100644 index 0000000..b4d42df Binary files /dev/null and b/www/spielsets/spielset1/images/Esel.png differ diff --git a/www/spielsets/spielset1/images/Hase.png b/www/spielsets/spielset1/images/Hase.png new file mode 100644 index 0000000..5db0e7c Binary files /dev/null and b/www/spielsets/spielset1/images/Hase.png differ diff --git a/www/spielsets/spielset1/images/Hund.png b/www/spielsets/spielset1/images/Hund.png new file mode 100644 index 0000000..932126e Binary files /dev/null and b/www/spielsets/spielset1/images/Hund.png differ diff --git a/www/spielsets/spielset1/images/Kamel.png b/www/spielsets/spielset1/images/Kamel.png new file mode 100644 index 0000000..1dbd462 Binary files /dev/null and b/www/spielsets/spielset1/images/Kamel.png differ diff --git a/www/spielsets/spielset1/images/Katze.png b/www/spielsets/spielset1/images/Katze.png new file mode 100644 index 0000000..570a755 Binary files /dev/null and b/www/spielsets/spielset1/images/Katze.png differ diff --git a/www/spielsets/spielset1/images/Krokodil.png b/www/spielsets/spielset1/images/Krokodil.png new file mode 100644 index 0000000..20cc899 Binary files /dev/null and b/www/spielsets/spielset1/images/Krokodil.png differ diff --git a/www/spielsets/spielset1/images/Kuh.png b/www/spielsets/spielset1/images/Kuh.png new file mode 100644 index 0000000..6674cc2 Binary files /dev/null and b/www/spielsets/spielset1/images/Kuh.png differ diff --git a/www/spielsets/spielset1/images/Loewe.png b/www/spielsets/spielset1/images/Loewe.png new file mode 100644 index 0000000..edf5ac6 Binary files /dev/null and b/www/spielsets/spielset1/images/Loewe.png differ diff --git a/www/spielsets/spielset1/images/Maus.png b/www/spielsets/spielset1/images/Maus.png new file mode 100644 index 0000000..9f8d221 Binary files /dev/null and b/www/spielsets/spielset1/images/Maus.png differ diff --git a/www/spielsets/spielset1/images/Nashorn.png b/www/spielsets/spielset1/images/Nashorn.png new file mode 100644 index 0000000..b8a9122 Binary files /dev/null and b/www/spielsets/spielset1/images/Nashorn.png differ diff --git a/www/spielsets/spielset1/images/Nilpferd.png b/www/spielsets/spielset1/images/Nilpferd.png new file mode 100644 index 0000000..55db6bd Binary files /dev/null and b/www/spielsets/spielset1/images/Nilpferd.png differ diff --git a/www/spielsets/spielset1/images/Schaf.png b/www/spielsets/spielset1/images/Schaf.png new file mode 100644 index 0000000..bc20e86 Binary files /dev/null and b/www/spielsets/spielset1/images/Schaf.png differ diff --git a/www/spielsets/spielset1/images/Schildkroete.png b/www/spielsets/spielset1/images/Schildkroete.png new file mode 100644 index 0000000..8163821 Binary files /dev/null and b/www/spielsets/spielset1/images/Schildkroete.png differ diff --git a/www/spielsets/spielset1/images/Schwein.png b/www/spielsets/spielset1/images/Schwein.png new file mode 100644 index 0000000..a3cc62a Binary files /dev/null and b/www/spielsets/spielset1/images/Schwein.png differ diff --git a/www/spielsets/spielset1/images/Stier.png b/www/spielsets/spielset1/images/Stier.png new file mode 100644 index 0000000..9eaf0bf Binary files /dev/null and b/www/spielsets/spielset1/images/Stier.png differ diff --git a/www/sounds/soundsneu/finde_affe.mp3 b/www/spielsets/spielset1/sounds/finde_affe.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_affe.mp3 rename to www/spielsets/spielset1/sounds/finde_affe.mp3 diff --git a/www/sounds/soundsneu/finde_esel.mp3 b/www/spielsets/spielset1/sounds/finde_esel.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_esel.mp3 rename to www/spielsets/spielset1/sounds/finde_esel.mp3 diff --git a/www/sounds/soundsneu/finde_hase.mp3 b/www/spielsets/spielset1/sounds/finde_hase.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_hase.mp3 rename to www/spielsets/spielset1/sounds/finde_hase.mp3 diff --git a/www/sounds/soundsneu/finde_hund.mp3 b/www/spielsets/spielset1/sounds/finde_hund.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_hund.mp3 rename to www/spielsets/spielset1/sounds/finde_hund.mp3 diff --git a/www/sounds/soundsneu/finde_kamel.mp3 b/www/spielsets/spielset1/sounds/finde_kamel.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_kamel.mp3 rename to www/spielsets/spielset1/sounds/finde_kamel.mp3 diff --git a/www/sounds/soundsneu/finde_katze.mp3 b/www/spielsets/spielset1/sounds/finde_katze.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_katze.mp3 rename to www/spielsets/spielset1/sounds/finde_katze.mp3 diff --git a/www/sounds/soundsneu/finde_krokodil.mp3 b/www/spielsets/spielset1/sounds/finde_krokodil.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_krokodil.mp3 rename to www/spielsets/spielset1/sounds/finde_krokodil.mp3 diff --git a/www/sounds/soundsneu/finde_kuh.mp3 b/www/spielsets/spielset1/sounds/finde_kuh.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_kuh.mp3 rename to www/spielsets/spielset1/sounds/finde_kuh.mp3 diff --git a/www/sounds/soundsneu/finde_loewe.mp3 b/www/spielsets/spielset1/sounds/finde_loewe.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_loewe.mp3 rename to www/spielsets/spielset1/sounds/finde_loewe.mp3 diff --git a/www/sounds/soundsneu/finde_maus.mp3 b/www/spielsets/spielset1/sounds/finde_maus.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_maus.mp3 rename to www/spielsets/spielset1/sounds/finde_maus.mp3 diff --git a/www/sounds/soundsneu/finde_nashorn.mp3 b/www/spielsets/spielset1/sounds/finde_nashorn.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_nashorn.mp3 rename to www/spielsets/spielset1/sounds/finde_nashorn.mp3 diff --git a/www/sounds/soundsneu/finde_nilpferd.mp3 b/www/spielsets/spielset1/sounds/finde_nilpferd.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_nilpferd.mp3 rename to www/spielsets/spielset1/sounds/finde_nilpferd.mp3 diff --git a/www/sounds/soundsneu/finde_schaf.mp3 b/www/spielsets/spielset1/sounds/finde_schaf.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_schaf.mp3 rename to www/spielsets/spielset1/sounds/finde_schaf.mp3 diff --git a/www/sounds/soundsneu/finde_schildkroete.mp3 b/www/spielsets/spielset1/sounds/finde_schildkroete.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_schildkroete.mp3 rename to www/spielsets/spielset1/sounds/finde_schildkroete.mp3 diff --git a/www/sounds/soundsneu/finde_schwein.mp3 b/www/spielsets/spielset1/sounds/finde_schwein.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_schwein.mp3 rename to www/spielsets/spielset1/sounds/finde_schwein.mp3 diff --git a/www/sounds/soundsneu/finde_stier.mp3 b/www/spielsets/spielset1/sounds/finde_stier.mp3 similarity index 100% rename from www/sounds/soundsneu/finde_stier.mp3 rename to www/spielsets/spielset1/sounds/finde_stier.mp3 diff --git a/www/spielsets/spielset1/spielset.json b/www/spielsets/spielset1/spielset.json new file mode 100644 index 0000000..09a6bac --- /dev/null +++ b/www/spielsets/spielset1/spielset.json @@ -0,0 +1,18 @@ +[ + {"id": 0, "bild": "spielsets/spielset1/images/Affe.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_affe.mp3", "display": false, "einblendecssid": "card1ein", "ausblendecssid": "card1aus", "sortid": 0}, + {"id": 1, "bild": "spielsets/spielset1/images/Esel.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_esel.mp3", "display": false, "einblendecssid": "card2ein", "ausblendecssid": "card2aus", "sortid": 0}, + {"id": 2, "bild": "spielsets/spielset1/images/Hase.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_hase.mp3", "display": false, "einblendecssid": "card3ein", "ausblendecssid": "card3aus", "sortid": 0}, + {"id": 3, "bild": "spielsets/spielset1/images/Hund.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_hund.mp3", "display": false, "einblendecssid": "card4ein", "ausblendecssid": "card4aus", "sortid": 0}, + {"id": 4, "bild": "spielsets/spielset1/images/Kamel.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_kamel.mp3", "display": false, "einblendecssid": "card5ein", "ausblendecssid": "card5aus", "sortid": 0}, + {"id": 5, "bild": "spielsets/spielset1/images/Katze.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_katze.mp3", "display": false, "einblendecssid": "card6ein", "ausblendecssid": "card6aus", "sortid": 0}, + {"id": 6, "bild": "spielsets/spielset1/images/Krokodil.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_krokodil.mp3", "display": false, "einblendecssid": "card7ein", "ausblendecssid": "card7aus", "sortid": 0}, + {"id": 7, "bild": "spielsets/spielset1/images/Kuh.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_kuh.mp3", "display": false, "einblendecssid": "card8ein", "ausblendecssid": "card8aus", "sortid": 0}, + {"id": 8, "bild": "spielsets/spielset1/images/Loewe.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_loewe.mp3", "display": false, "einblendecssid": "card9ein", "ausblendecssid": "card9aus", "sortid": 0}, + {"id": 9, "bild": "spielsets/spielset1/images/Maus.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_maus.mp3", "display": false, "einblendecssid": "card10ein", "ausblendecssid": "card10aus", "sortid": 0}, + {"id": 10, "bild": "spielsets/spielset1/images/Nashorn.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_nashorn.mp3", "display": false, "einblendecssid": "card11ein", "ausblendecssid": "card11aus", "sortid": 0}, + {"id": 11, "bild": "spielsets/spielset1/images/Nilpferd.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_nilpferd.mp3", "display": false, "einblendecssid": "card12ein", "ausblendecssid": "card12aus", "sortid": 0}, + {"id": 12, "bild": "spielsets/spielset1/images/Schaf.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_schaf.mp3", "display": false, "einblendecssid": "card13ein", "ausblendecssid": "card13aus", "sortid": 0}, + {"id": 13, "bild": "spielsets/spielset1/images/Schildkroete.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_schildkroete.mp3", "display": false, "einblendecssid": "card14ein", "ausblendecssid": "card14aus", "sortid": 0}, + {"id": 14, "bild": "spielsets/spielset1/images/Schwein.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_schwein.mp3", "display": false, "einblendecssid": "card15ein", "ausblendecssid": "card15aus", "sortid": 0}, + {"id": 15, "bild": "spielsets/spielset1/images/Stier.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_stier.mp3", "display": false, "einblendecssid": "card16ein", "ausblendecssid": "card16aus", "sortid": 0} + ] \ No newline at end of file diff --git a/www/spielsets/spielset1/systemsounds.json b/www/spielsets/spielset1/systemsounds.json new file mode 100644 index 0000000..45766ce --- /dev/null +++ b/www/spielsets/spielset1/systemsounds.json @@ -0,0 +1,16 @@ +[ + {"id": 0, "type": "successsound", "sound": "/android_asset/www/sounds/erfolg_1.mp3"}, + {"id": 1, "type": "successsound", "sound": "/android_asset/www/sounds/erfolg_2.mp3"}, + {"id": 2, "type": "successsound", "sound": "/android_asset/www/sounds/erfolg_3.mp3"}, + {"id": 3, "type": "successsound", "sound": "/android_asset/www/sounds/erfolg_4.mp3"}, + {"id": 4, "type": "successsound", "sound": "/android_asset/www/sounds/erfolg_5.mp3"}, + {"id": 5, "type": "failuresound", "sound": "/android_asset/www/sounds/niederlage_1.mp3"}, + {"id": 6, "type": "failuresound", "sound": "/android_asset/www/sounds/niederlage_2.mp3"}, + {"id": 7, "type": "failuresound", "sound": "/android_asset/www/sounds/niederlage_3.mp3"}, + {"id": 8, "type": "failuresound", "sound": "/android_asset/www/sounds/niederlage_4.mp3"}, + {"id": 9, "type": "failuresound", "sound": "/android_asset/www/sounds/niederlage_5.mp3"}, + {"id": 10, "type": "cardsound", "sound": "/android_asset/www/sounds/karte.mp3"}, + {"id": 11, "type": "solutionsound", "sound": "/android_asset/www/sounds/aufloesung.mp3"}, + {"id": 12, "type": "gameoversound", "sound": "/android_asset/www/sounds/minispiel/geschafft.mp3"}, + {"id": 13, "type": "backgroundmusic", "sound": "/android_asset/www/sounds/background/background4.mid"} +] \ No newline at end of file diff --git a/www/templates/suchspiel.html b/www/templates/suchspiel.html index e896318..93852d4 100644 --- a/www/templates/suchspiel.html +++ b/www/templates/suchspiel.html @@ -11,7 +11,7 @@
- +