diff --git a/www/css/style.css b/www/css/style.css index 6ed0589..67a68ff 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -9,7 +9,7 @@ */ .scroll-content { - background: url("../img/background.svg"); + background: url("../img/Background/background.svg"); background-size: cover; color: #333; font: 100% Arial, Sans Serif; @@ -35,16 +35,81 @@ to {background-position: -2000px 0;} } */ .baumhaus { - background: url("../img/treehouse.svg"); + background: url("../img/Background/treehouse.svg"); background-size: cover; position:fixed; bottom:0; - left:0; + left:-25px; width: 256px; height: 256px; overflow: hidden; } +.farmhaus { + background: url("../img/Background/Farmhaus.svg"); + background-size: cover; + position:fixed; + bottom:60px; + Right:10px; + width: 30px; + height: 40px; + overflow: hidden; +} + +.windrad { + background: url("../img/Background/Windrad.svg"); + background-size: cover; + position:fixed; + bottom:65px; + Right:60px; + width: 60px; + height: 80px; + overflow: hidden; +} + +.kornspeicher { + background: url("../img/Background/Kornspeicher.svg"); + background-size: cover; + position:fixed; + bottom:40px; + Left:275px; + width: 60px; + height: 80px; + overflow: hidden; +} + +.suchspielbutton { + position: absolute; + bottom:15px; + left:370px; + width: 128px; + height: 128px; + overflow: hidden; +} + +/* Tierbilder groessen */ +.imagesizebig{ + width:128px; + height:128px; +} + +.imagesizemedium{ + width:96px; + height:96px; +} + + + +.gras { + background: url("../img/Background/Grasbuechel.svg"); + background-size: cover; + position:absolute; + width: 16; + height: 16px; + overflow: hidden; +} + + .statusbar{ position: absolute; bottom: 0px; @@ -82,6 +147,53 @@ to {background-position: -2000px 0;} 0 0 160px yellow; } + +.spieltimer { + font-family: sans-serif; + text-transform: uppercase; + font-size: 40px; + font-weight: bold; + font-style: italic; + letter-spacing: .1em; + color: white; + text-shadow: 0 0 5px white, + 0 0 10px white, + 0 0 20px yellow, + 0 0 40px yellow, + 0 0 60px yellow, + 0 0 90px yellow, + 0 0 120px yellow, + 0 0 160px yellow; +} + + +.spieltimerdiv { + position: absolute; + bottom:0px; + left:0px; + width: 100%; + height: 50px; + overflow: hidden; +} + +.punktestand { + position: absolute; + bottom:-15px; + right:0px; + width: 100%; + height: 50px; + font-family: sans-serif; + text-transform: uppercase; + font-size: 30px; + font-weight: bold; + font-style: italic; + letter-spacing: .1em; + color:white; + text-align: right; + overflow: hidden; +} + + .redborder{ display: inline-block; border-radius: 6px; @@ -99,7 +211,7 @@ to {background-position: -2000px 0;} width: 64px; height: 64px; overflow: hidden; - background: url('../img/mentorhelp_64px.png'); + background: url('../img/Mentor/mentorhelp_64px.png'); } .mentorborder { @@ -109,13 +221,13 @@ to {background-position: -2000px 0;} width: 64px; height: 64px; overflow: hidden; - background: url('../img/mentorhelp_64px.png'); + background: url('../img/Mentor/mentorhelp_64px.png'); } .mentor { width: 64px; height: 640px; - background: url('../img/mentor_64px.png') left center; + background: url('../img/Mentor/mentor_64px.png') left center; -webkit-animation: mentorsprite 4s steps(10) infinite; } @@ -123,6 +235,16 @@ to {background-position: -2000px 0;} 100% { background-position: 0 -640px; } } + +.baumhausaction { + position: absolute; + top: 100px; + left: 110px; + width: 60px; + height: 60px; + overflow: hidden; +} + .mentorborderbaumhaus { position: absolute; top: 122px; @@ -135,7 +257,7 @@ to {background-position: -2000px 0;} .mentorbaumhaus { width: 32px; height: 320px; - background: url('../img/mentor_32px.png') left center; + background: url('../img/Mentor/mentor_32px.png') left center; -webkit-animation: mentorspritebaumhaus 3.8s steps(10) infinite; } @@ -145,18 +267,20 @@ to {background-position: -2000px 0;} .mentorborderbravo { - position:fixed; - bottom:0; - right:0; + position: fixed; + top: 50%; + left: 50%; width: 256px; height: 256px; + margin-left: -128px; + margin-top: -128px; overflow: hidden; } .mentorbravo { width: 256px; height: 1024px; - background: url('../img/mentor_bravo.png') left center; + background: url('../img/Mentor/mentor_bravo.png') left center; -webkit-animation: mentorspritebravo 2.8s steps(4) infinite; } diff --git a/www/img/elefant.jpg b/www/img/ALT/elefant.jpg similarity index 100% rename from www/img/elefant.jpg rename to www/img/ALT/elefant.jpg diff --git a/www/img/esel.jpg b/www/img/ALT/esel.jpg similarity index 100% rename from www/img/esel.jpg rename to www/img/ALT/esel.jpg diff --git a/www/img/hahn.jpg b/www/img/ALT/hahn.jpg similarity index 100% rename from www/img/hahn.jpg rename to www/img/ALT/hahn.jpg diff --git a/www/img/hund.jpg b/www/img/ALT/hund.jpg similarity index 100% rename from www/img/hund.jpg rename to www/img/ALT/hund.jpg diff --git a/www/img/katze.jpg b/www/img/ALT/katze.jpg similarity index 100% rename from www/img/katze.jpg rename to www/img/ALT/katze.jpg diff --git a/www/img/kuh.jpg b/www/img/ALT/kuh.jpg similarity index 100% rename from www/img/kuh.jpg rename to www/img/ALT/kuh.jpg diff --git a/www/img/maus.jpg b/www/img/ALT/maus.jpg similarity index 100% rename from www/img/maus.jpg rename to www/img/ALT/maus.jpg diff --git a/www/img/schaf.jpg b/www/img/ALT/schaf.jpg similarity index 100% rename from www/img/schaf.jpg rename to www/img/ALT/schaf.jpg diff --git a/www/img/Background/Baum.svg b/www/img/Background/Baum.svg new file mode 100644 index 0000000..7f955c3 --- /dev/null +++ b/www/img/Background/Baum.svg @@ -0,0 +1,700 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Background/Farmhaus.svg b/www/img/Background/Farmhaus.svg new file mode 100644 index 0000000..48d5e8e --- /dev/null +++ b/www/img/Background/Farmhaus.svg @@ -0,0 +1,841 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Background/Grasbuechel.svg b/www/img/Background/Grasbuechel.svg new file mode 100644 index 0000000..52299c3 --- /dev/null +++ b/www/img/Background/Grasbuechel.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/www/img/Background/Kornspeicher.svg b/www/img/Background/Kornspeicher.svg new file mode 100644 index 0000000..aef335f --- /dev/null +++ b/www/img/Background/Kornspeicher.svg @@ -0,0 +1,747 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Background/Windrad.svg b/www/img/Background/Windrad.svg new file mode 100644 index 0000000..e34aa99 --- /dev/null +++ b/www/img/Background/Windrad.svg @@ -0,0 +1,904 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/background.svg b/www/img/Background/background.svg similarity index 100% rename from www/img/background.svg rename to www/img/Background/background.svg diff --git a/www/img/statusbar.svg b/www/img/Background/statusbar.svg similarity index 100% rename from www/img/statusbar.svg rename to www/img/Background/statusbar.svg diff --git a/www/img/treehouse.svg b/www/img/Background/treehouse.svg similarity index 100% rename from www/img/treehouse.svg rename to www/img/Background/treehouse.svg diff --git a/www/img/mentor.png b/www/img/Mentor/mentor.png similarity index 100% rename from www/img/mentor.png rename to www/img/Mentor/mentor.png diff --git a/www/img/mentor.psd b/www/img/Mentor/mentor.psd similarity index 100% rename from www/img/mentor.psd rename to www/img/Mentor/mentor.psd diff --git a/www/img/mentor_32px.png b/www/img/Mentor/mentor_32px.png similarity index 100% rename from www/img/mentor_32px.png rename to www/img/Mentor/mentor_32px.png diff --git a/www/img/mentor_64px.png b/www/img/Mentor/mentor_64px.png similarity index 100% rename from www/img/mentor_64px.png rename to www/img/Mentor/mentor_64px.png diff --git a/www/img/mentor_bravo.png b/www/img/Mentor/mentor_bravo.png similarity index 100% rename from www/img/mentor_bravo.png rename to www/img/Mentor/mentor_bravo.png diff --git a/www/img/mentor_bravo.psd b/www/img/Mentor/mentor_bravo.psd similarity index 100% rename from www/img/mentor_bravo.psd rename to www/img/Mentor/mentor_bravo.psd diff --git a/www/img/mentorhelp.png b/www/img/Mentor/mentorhelp.png similarity index 100% rename from www/img/mentorhelp.png rename to www/img/Mentor/mentorhelp.png diff --git a/www/img/mentorhelp_64px.png b/www/img/Mentor/mentorhelp_64px.png similarity index 100% rename from www/img/mentorhelp_64px.png rename to www/img/Mentor/mentorhelp_64px.png diff --git a/www/img/Tiere/Affe.png b/www/img/Tiere/Affe.png new file mode 100644 index 0000000..b8ff90a Binary files /dev/null and b/www/img/Tiere/Affe.png differ diff --git a/www/img/Tiere/Affe.svg b/www/img/Tiere/Affe.svg new file mode 100644 index 0000000..bd42ea3 --- /dev/null +++ b/www/img/Tiere/Affe.svg @@ -0,0 +1,1566 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Esel.png b/www/img/Tiere/Esel.png new file mode 100644 index 0000000..b4d42df Binary files /dev/null and b/www/img/Tiere/Esel.png differ diff --git a/www/img/Tiere/Esel.svg b/www/img/Tiere/Esel.svg new file mode 100644 index 0000000..bf33d17 --- /dev/null +++ b/www/img/Tiere/Esel.svg @@ -0,0 +1,1736 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Hase.png b/www/img/Tiere/Hase.png new file mode 100644 index 0000000..5db0e7c Binary files /dev/null and b/www/img/Tiere/Hase.png differ diff --git a/www/img/Tiere/Hase.svg b/www/img/Tiere/Hase.svg new file mode 100644 index 0000000..3bb68be --- /dev/null +++ b/www/img/Tiere/Hase.svg @@ -0,0 +1,1436 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Hund.png b/www/img/Tiere/Hund.png new file mode 100644 index 0000000..932126e Binary files /dev/null and b/www/img/Tiere/Hund.png differ diff --git a/www/img/Tiere/Hund.svg b/www/img/Tiere/Hund.svg new file mode 100644 index 0000000..34274aa --- /dev/null +++ b/www/img/Tiere/Hund.svg @@ -0,0 +1,743 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Kamel.png b/www/img/Tiere/Kamel.png new file mode 100644 index 0000000..1dbd462 Binary files /dev/null and b/www/img/Tiere/Kamel.png differ diff --git a/www/img/Tiere/Kamel.svg b/www/img/Tiere/Kamel.svg new file mode 100644 index 0000000..5ce9d3f --- /dev/null +++ b/www/img/Tiere/Kamel.svg @@ -0,0 +1,1603 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Katze.png b/www/img/Tiere/Katze.png new file mode 100644 index 0000000..570a755 Binary files /dev/null and b/www/img/Tiere/Katze.png differ diff --git a/www/img/Tiere/Katze.svg b/www/img/Tiere/Katze.svg new file mode 100644 index 0000000..72176b3 --- /dev/null +++ b/www/img/Tiere/Katze.svg @@ -0,0 +1,793 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Krokodil.png b/www/img/Tiere/Krokodil.png new file mode 100644 index 0000000..20cc899 Binary files /dev/null and b/www/img/Tiere/Krokodil.png differ diff --git a/www/img/Tiere/Krokodil.svg b/www/img/Tiere/Krokodil.svg new file mode 100644 index 0000000..47ae053 --- /dev/null +++ b/www/img/Tiere/Krokodil.svg @@ -0,0 +1,479 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Kuh.png b/www/img/Tiere/Kuh.png new file mode 100644 index 0000000..6674cc2 Binary files /dev/null and b/www/img/Tiere/Kuh.png differ diff --git a/www/img/Tiere/Kuh.svg b/www/img/Tiere/Kuh.svg new file mode 100644 index 0000000..da94c57 --- /dev/null +++ b/www/img/Tiere/Kuh.svg @@ -0,0 +1,946 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Loewe.png b/www/img/Tiere/Loewe.png new file mode 100644 index 0000000..edf5ac6 Binary files /dev/null and b/www/img/Tiere/Loewe.png differ diff --git a/www/img/Tiere/Loewe.svg b/www/img/Tiere/Loewe.svg new file mode 100644 index 0000000..9afb802 --- /dev/null +++ b/www/img/Tiere/Loewe.svg @@ -0,0 +1,1002 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Maus.png b/www/img/Tiere/Maus.png new file mode 100644 index 0000000..9f8d221 Binary files /dev/null and b/www/img/Tiere/Maus.png differ diff --git a/www/img/Tiere/Maus.svg b/www/img/Tiere/Maus.svg new file mode 100644 index 0000000..10b664b --- /dev/null +++ b/www/img/Tiere/Maus.svg @@ -0,0 +1,1611 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Nashorn.png b/www/img/Tiere/Nashorn.png new file mode 100644 index 0000000..b8a9122 Binary files /dev/null and b/www/img/Tiere/Nashorn.png differ diff --git a/www/img/Tiere/Nashorn.svg b/www/img/Tiere/Nashorn.svg new file mode 100644 index 0000000..faff5a7 --- /dev/null +++ b/www/img/Tiere/Nashorn.svg @@ -0,0 +1,1113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Nilpferd.png b/www/img/Tiere/Nilpferd.png new file mode 100644 index 0000000..55db6bd Binary files /dev/null and b/www/img/Tiere/Nilpferd.png differ diff --git a/www/img/Tiere/Nilpferd.svg b/www/img/Tiere/Nilpferd.svg new file mode 100644 index 0000000..ccdd2ee --- /dev/null +++ b/www/img/Tiere/Nilpferd.svg @@ -0,0 +1,1824 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Schaf.png b/www/img/Tiere/Schaf.png new file mode 100644 index 0000000..bc20e86 Binary files /dev/null and b/www/img/Tiere/Schaf.png differ diff --git a/www/img/Tiere/Schaf.svg b/www/img/Tiere/Schaf.svg new file mode 100644 index 0000000..2774940 --- /dev/null +++ b/www/img/Tiere/Schaf.svg @@ -0,0 +1,508 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Schildkroete.png b/www/img/Tiere/Schildkroete.png new file mode 100644 index 0000000..8163821 Binary files /dev/null and b/www/img/Tiere/Schildkroete.png differ diff --git a/www/img/Tiere/Schildkroete.svg b/www/img/Tiere/Schildkroete.svg new file mode 100644 index 0000000..b9cf85f --- /dev/null +++ b/www/img/Tiere/Schildkroete.svg @@ -0,0 +1,2113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Schwein.png b/www/img/Tiere/Schwein.png new file mode 100644 index 0000000..a3cc62a Binary files /dev/null and b/www/img/Tiere/Schwein.png differ diff --git a/www/img/Tiere/Schwein.svg b/www/img/Tiere/Schwein.svg new file mode 100644 index 0000000..86960e6 --- /dev/null +++ b/www/img/Tiere/Schwein.svg @@ -0,0 +1,818 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Tiere/Stier.png b/www/img/Tiere/Stier.png new file mode 100644 index 0000000..9eaf0bf Binary files /dev/null and b/www/img/Tiere/Stier.png differ diff --git a/www/img/Tiere/Stier.svg b/www/img/Tiere/Stier.svg new file mode 100644 index 0000000..20a2c83 --- /dev/null +++ b/www/img/Tiere/Stier.svg @@ -0,0 +1,1551 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/lupe.png b/www/img/lupe.png new file mode 100644 index 0000000..5bcdee1 Binary files /dev/null and b/www/img/lupe.png differ diff --git a/www/img/suchspiel.png b/www/img/suchspiel.png new file mode 100644 index 0000000..ec71159 Binary files /dev/null and b/www/img/suchspiel.png differ diff --git a/www/js/home_controller.js b/www/js/home_controller.js index a2688f2..ec3f4ea 100644 --- a/www/js/home_controller.js +++ b/www/js/home_controller.js @@ -1,17 +1,35 @@ -appControllers.controller('home', function($scope, $ionicPlatform, $cordovaMedia, $state, backgroundsounds_mediahandler ) { +appControllers.controller('home', function($scope, $ionicPlatform, $cordovaMedia, $state, backgroundsounds_mediahandler, $timeout ) { /* * Mentor-Anitmation ausschalten */ $scope.showmentor=false; $scope.CSSKlickSuchspiel=false; + $scope.CSSFarmhaus=false; + $scope.CSSWindrad=false; + $scope.CSSKornspeicher=false; + $scope.baumhauszufallaction=99; /* * Hintergrundmusik laden und starten */ $ionicPlatform.ready(function() { - var mediastartesuchspiel = new Media('/android_asset/www/sounds/suchspiel.mp3', suchspiel_intro_finish,null); + + $scope.baumhaus_action=[]; + + var mediastartesuchspiel = new Media('/android_asset/www/sounds/soundsneu/spiel_intro.mp3', suchspiel_intro_finish,null); + + 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); + $scope.mediastartesuchspiel=mediastartesuchspiel; backgroundsounds_mediahandler.playbackgroundmusic(); + + $scope.baumhaus_action.push(baumhaus_action1); + $scope.baumhaus_action.push(baumhaus_action2); + $scope.baumhaus_action.push(baumhaus_action3); + $scope.baumhaus_action.push(baumhaus_action4); }); /* @@ -34,4 +52,63 @@ appControllers.controller('home', function($scope, $ionicPlatform, $cordovaMedia $state.go('suchspiel'); } + $scope.animate_farmhaus=function(){ + $scope.CSSFarmhaus=true; + $timeout(function () { + $scope.CSSFarmhaus=false; + }, 5000); + } + + + $scope.animate_windrad=function(){ + $scope.CSSWindrad=true; + $timeout(function () { + $scope.CSSWindrad=false; + }, 5000); + } + + + $scope.animate_kornspeicher=function(){ + $scope.CSSKornspeicher=true; + $timeout(function () { + $scope.CSSKornspeicher=false; + }, 5000); + } + + $scope.baumhaus_actiondo=function(){ + + $scope.baumhauszufallaction=getRandomInt(1,5); + if ($scope.baumhauszufallaction==3){ + $scope.showmentor=true; + $scope.baumhaus_action[getRandomInt(0,3)].play(); + $scope.mediastartesuchspiel.setVolume('1.0'); + } + } + + + function baumhaus_mentor(){ + $timeout(function () { + $scope.showmentor=false; + }, 0); + } + + /* + * Zufall für Baumhausaction + */ + function getRandomInt(min, max) { + var tmpInt=0; + min = Math.ceil(min); + max = Math.floor(max); + tmpInt = Math.floor(Math.random() * (max - min + 1)) + min; + + if (tmpInt > max){ + tmpInt=max; + } + + if (tmpInt < min){ + tmpInt=min; + } + return tmpInt; + } + }); \ No newline at end of file diff --git a/www/js/services.js b/www/js/services.js index 8f2dbe4..dc58f5a 100644 --- a/www/js/services.js +++ b/www/js/services.js @@ -12,15 +12,15 @@ angular.module('kinderspiel.services', []) */ var backgroundmusic=''; $ionicPlatform.ready(function() { - var mybackground_music = new Media('/android_asset/www/sounds/TORN.MID', loopbackgroundmusic ,null); + var mybackground_music = new Media('/android_asset/www/sounds/background/backgound4.mid', loopbackgroundmusic ,null); backgroundmusic=mybackground_music; }); function loopbackgroundmusic(){ if (inbackground == false){ - backgroundmusic.release(); - backgroundmusic=mybackground_music; + //backgroundmusic.release(); + //backgroundmusic=mybackground_music; backgroundmusic.play(); backgroundmusic.setVolume('0.3'); } diff --git a/www/js/suchspiel_controller.js b/www/js/suchspiel_controller.js index e7b491d..0937118 100644 --- a/www/js/suchspiel_controller.js +++ b/www/js/suchspiel_controller.js @@ -11,6 +11,7 @@ $scope.showmentorbravo=false; //Kartenarray + ListenAnsichtArray $scope.spiele=[]; +$scope.spielealletiere=[]; $scope.spielelistensort=[]; //Zufallsgenerator ID = TierindexID @@ -36,6 +37,16 @@ $scope.showgametimer = false; $scope.spielvorbei=false; $scope.beantwortet=false; +//Mentor Zufallseinblendung +$scope.randomMentor=0; + +$scope.punkte=0; +$scope.punktebonus=0; + + +//Zeitmessung für PunkteBonus +$scope.rundenstart = ''; +$scope.rundenende = ''; $ionicPlatform.ready(function() { @@ -44,43 +55,64 @@ $ionicPlatform.ready(function() { * Sounds definieren */ $scope.sounds=[]; - + $scope.bravosounds=[]; + $scope.falschsounds=[]; + $scope.aufloesung=''; /* * Sounds laden */ - var tiersound1 = new Media('/android_asset/www/sounds/finde_elefant.mp3', mentorausblenden,null); - var tiersound2 = new Media('/android_asset/www/sounds/finde_esel.mp3', mentorausblenden,null); - var tiersound3 = new Media('/android_asset/www/sounds/finde_hahn.mp3', mentorausblenden,null); - var tiersound4 = new Media('/android_asset/www/sounds/finde_hund.mp3', mentorausblenden,null); - var tiersound5 = new Media('/android_asset/www/sounds/finde_katze.mp3', mentorausblenden,null); - var tiersound6 = new Media('/android_asset/www/sounds/finde_kuh.mp3', mentorausblenden,null); - var tiersound7 = new Media('/android_asset/www/sounds/finde_maus.mp3', mentorausblenden,null); - var tiersound8 = new Media('/android_asset/www/sounds/finde_schaf.mp3', mentorausblenden,null); + 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 bravosound = new Media('/android_asset/www/sounds/bravo.mp3', karteausblenden,null); - var falschsound = new Media('/android_asset/www/sounds/falsch.mp3', null,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); /* * Sounds in $Scope referenzieren */ - $scope.bravosound=bravosound; - $scope.falschsound=falschsound; $scope.kartegebensound=kartegebensound; + $scope.aufloesung=aufloesungsound; - $scope.sounds.push(tiersound1); - $scope.sounds.push(tiersound2); - $scope.sounds.push(tiersound3); - $scope.sounds.push(tiersound4); - $scope.sounds.push(tiersound5); - $scope.sounds.push(tiersound6); - $scope.sounds.push(tiersound7); - $scope.sounds.push(tiersound8); + $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); /* @@ -88,113 +120,204 @@ $ionicPlatform.ready(function() { */ var tier = { id: 0, - bild: 'elefant.jpg', - sound1: 'sound_elefant.mp3', - antwort: '', + bild: 'Affe.png', + sound1: tiersound1, display: false, - einblendecssid: 'elefantein', - ausblendecssid: 'elefantaus', + einblendecssid: 'affeein', + ausblendecssid: 'affeaus', sortid: 0 }; -$scope.spiele.push(tier); +$scope.spielealletiere.push(tier); var tier1 = { id: 1, - bild: 'esel.jpg', - sound1: 'sound_esel.mp3', - antwort: '', + bild: 'Esel.png', + sound1: tiersound2, display: false, einblendecssid: 'eselein', ausblendecssid: 'eselaus', sortid: 0 }; -$scope.spiele.push(tier1); +$scope.spielealletiere.push(tier1); var tier2 = { id: 2, - bild: 'hahn.jpg', - sound1: 'sound_hahn.mp3', - antwort: '', + bild: 'Hase.png', + sound1: tiersound3, display: false, - einblendecssid: 'hahnein', - ausblendecssid: 'hahnaus', + einblendecssid: 'haseein', + ausblendecssid: 'haseaus', sortid: 0 }; -$scope.spiele.push(tier2); +$scope.spielealletiere.push(tier2); var tier3 = { id: 3, - bild: 'hund.jpg', - sound1: 'sound_hund.mp3', - sound2: '', + bild: 'Hund.png', + sound1: tiersound4, display: false, einblendecssid: 'hundein', ausblendecssid: 'hundaus', sortid: 0 }; -$scope.spiele.push(tier3); +$scope.spielealletiere.push(tier3); var tier4 = { id: 4, - bild: 'katze.jpg', - sound1: 'sound_katze.mp3', - sound2: '', + 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.spiele.push(tier4); +$scope.spielealletiere.push(tier5); -var tier5 = { - id: 5, - bild: 'kuh.jpg', - sound1: 'sound_kuh.mp3', - sound2: '', +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.spiele.push(tier5); +$scope.spielealletiere.push(tier7); -var tier6 = { - id: 6, - bild: 'maus.jpg', - sound1: 'sound_maus.mp3', - sound2: '', +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.spiele.push(tier6); +$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 tier7 = { - id: 7, - bild: 'schaf.jpg', - sound1: 'sound_schaf.mp3', - sound2: '', +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.spiele.push(tier7); +$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); + + + +}); + + + /* * Wiederholung der Aufgabe */ $scope.hilfe = function() { + console.log("Hilfe geklickt"); $scope.showmentor=true; - $scope.sounds[$scope.randomid].play(); + $scope.spiele[$scope.randomid].sound1.play(); } @@ -228,10 +351,26 @@ $scope.PlayerAnswer = function(src) { $scope.beantwortet=true; if (src==$scope.randomid){ $timeout(function () { - $scope.showmentorbravo=true; + $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.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); - $scope.bravosound.play(); + $scope.bravosounds[getRandomInt(0, 4)].play(); } else{ @@ -248,18 +387,15 @@ $scope.PlayerAnswer = function(src) { /* * Nach 3 sekunden Fehler zurücksetzen und Karten neu vergeben */ - $timeout(function () { - $scope.CSSErrorCode=99; - $scope.cardindex=0; - karteausblenden(); - }, 3000); - + $scope.showmentor=true; + $scope.aufloesung.play(); } else { /* * Antwort ist falsch */ - $scope.falschsound.play(); + $scope.showmentor=true; + $scope.falschsounds[getRandomInt(0, 4)].play(); $scope.CSSFalscheAntwort = true; $timeout(function () { $scope.CSSFalscheAntwort = false; @@ -320,13 +456,17 @@ function kartegeben(){ $scope.randomid=getRandomInt(0, 7); $scope.randomid=getRandomInt(0, 7); + + $scope.rundenstart = new Date().getTime(); /* * Mentor anzeigen und Sound wiedergeben */ $scope.showmentor=true; - $scope.sounds[$scope.randomid].play(); + $scope.spiele[$scope.randomid].sound1.play(); console.log("ELSE-Zweig Einblende -ID: " + $scope.CSSEinblendung); console.log("CardIndex: " + $scope.cardindex); + console.log("Zufallsid: " + $scope.randomid); + console.log("Tiersuchen: " + $scope.spiele[$scope.randomid].bild); } console.log("Einblende funktion ID: " + $scope.CSSEinblendung); } @@ -335,7 +475,7 @@ function kartegeben(){ * Karten wieder einsammeln, runde beendet */ function karteausblenden(){ - $timeout(function () { $scope.showmentorbravo=false; }, 0); + $timeout(function () { $scope.showmentorbravo=false; $scope.showmentor=false;}, 0); if ($scope.spielvorbei==false){ @@ -388,17 +528,34 @@ function SpieleTimer(){ } +function aufloesung(){ + + $scope.CSSErrorCode=99; + $scope.cardindex=0; + karteausblenden(); + +} + /* * Drei mal mischen :) */ function kartenmischen(){ - $scope.spiele=shuffleArray($scope.spiele); - $scope.spiele=shuffleArray($scope.spiele); - $scope.spiele=shuffleArray($scope.spiele); + $scope.spielealletiere=shuffleArray($scope.spielealletiere); + $scope.spielealletiere=shuffleArray($scope.spielealletiere); + $scope.spielealletiere=shuffleArray($scope.spielealletiere); + + $scope.spiele=[]; + for(var i = 0; i < 8; i++) { + var data= $scope.spielealletiere[i]; + data.id=i; + $scope.spiele.push(data); + } + $scope.spielelistensort=[]; - for(var i = 0; i < $scope.spiele.length; i++) { + //for(var i = 0; i < $scope.spiele.length; i++) { + for(var i = 0; i < 8; i++) { var data= $scope.spiele[i]; data.sortid=i; $scope.spielelistensort.push(data); @@ -475,7 +632,7 @@ $timeout(function () { function inittimer(){ $scope.CCSInittimer=true; - if ($scope.inittimercounter > 0){ + if ($scope.inittimercounter > 1){ $scope.inittimercounter=$scope.inittimercounter - 1; $timeout(function () { @@ -491,7 +648,7 @@ function inittimer(){ $scope.showgametimer = true; SpieleTimer(); goto_newspiel(); - }, 1500); + }, 1000); } } diff --git a/www/sounds/background/backgound1.mid b/www/sounds/background/backgound1.mid new file mode 100644 index 0000000..33acc4f Binary files /dev/null and b/www/sounds/background/backgound1.mid differ diff --git a/www/sounds/background/backgound2.mid b/www/sounds/background/backgound2.mid new file mode 100644 index 0000000..94fd9a7 Binary files /dev/null and b/www/sounds/background/backgound2.mid differ diff --git a/www/sounds/background/backgound3.mid b/www/sounds/background/backgound3.mid new file mode 100644 index 0000000..d46e8eb Binary files /dev/null and b/www/sounds/background/backgound3.mid differ diff --git a/www/sounds/background/backgound4.mid b/www/sounds/background/backgound4.mid new file mode 100644 index 0000000..b7cc666 Binary files /dev/null and b/www/sounds/background/backgound4.mid differ diff --git a/www/sounds/soundsneu/aufloesung.mp3 b/www/sounds/soundsneu/aufloesung.mp3 new file mode 100644 index 0000000..1ea490f Binary files /dev/null and b/www/sounds/soundsneu/aufloesung.mp3 differ diff --git a/www/sounds/soundsneu/baumhaus_action_1.mp3 b/www/sounds/soundsneu/baumhaus_action_1.mp3 new file mode 100644 index 0000000..02041bb Binary files /dev/null and b/www/sounds/soundsneu/baumhaus_action_1.mp3 differ diff --git a/www/sounds/soundsneu/baumhaus_action_2.mp3 b/www/sounds/soundsneu/baumhaus_action_2.mp3 new file mode 100644 index 0000000..7709ad8 Binary files /dev/null and b/www/sounds/soundsneu/baumhaus_action_2.mp3 differ diff --git a/www/sounds/soundsneu/baumhaus_action_3.mp3 b/www/sounds/soundsneu/baumhaus_action_3.mp3 new file mode 100644 index 0000000..d36aabe Binary files /dev/null and b/www/sounds/soundsneu/baumhaus_action_3.mp3 differ diff --git a/www/sounds/soundsneu/baumhaus_action_4.mp3 b/www/sounds/soundsneu/baumhaus_action_4.mp3 new file mode 100644 index 0000000..aeeb083 Binary files /dev/null and b/www/sounds/soundsneu/baumhaus_action_4.mp3 differ diff --git a/www/sounds/soundsneu/erfolg_1.mp3 b/www/sounds/soundsneu/erfolg_1.mp3 new file mode 100644 index 0000000..cbc9744 Binary files /dev/null and b/www/sounds/soundsneu/erfolg_1.mp3 differ diff --git a/www/sounds/soundsneu/erfolg_2.mp3 b/www/sounds/soundsneu/erfolg_2.mp3 new file mode 100644 index 0000000..ec6f7b6 Binary files /dev/null and b/www/sounds/soundsneu/erfolg_2.mp3 differ diff --git a/www/sounds/soundsneu/erfolg_3.mp3 b/www/sounds/soundsneu/erfolg_3.mp3 new file mode 100644 index 0000000..0db8562 Binary files /dev/null and b/www/sounds/soundsneu/erfolg_3.mp3 differ diff --git a/www/sounds/soundsneu/erfolg_4.mp3 b/www/sounds/soundsneu/erfolg_4.mp3 new file mode 100644 index 0000000..2b61bba Binary files /dev/null and b/www/sounds/soundsneu/erfolg_4.mp3 differ diff --git a/www/sounds/soundsneu/erfolg_5.mp3 b/www/sounds/soundsneu/erfolg_5.mp3 new file mode 100644 index 0000000..287dedd Binary files /dev/null and b/www/sounds/soundsneu/erfolg_5.mp3 differ diff --git a/www/sounds/soundsneu/finde_affe.mp3 b/www/sounds/soundsneu/finde_affe.mp3 new file mode 100644 index 0000000..f1b2fb0 Binary files /dev/null and b/www/sounds/soundsneu/finde_affe.mp3 differ diff --git a/www/sounds/soundsneu/finde_esel.mp3 b/www/sounds/soundsneu/finde_esel.mp3 new file mode 100644 index 0000000..d57fc7f Binary files /dev/null and b/www/sounds/soundsneu/finde_esel.mp3 differ diff --git a/www/sounds/soundsneu/finde_hase.mp3 b/www/sounds/soundsneu/finde_hase.mp3 new file mode 100644 index 0000000..5bf591d Binary files /dev/null and b/www/sounds/soundsneu/finde_hase.mp3 differ diff --git a/www/sounds/soundsneu/finde_hund.mp3 b/www/sounds/soundsneu/finde_hund.mp3 new file mode 100644 index 0000000..9e29e84 Binary files /dev/null and b/www/sounds/soundsneu/finde_hund.mp3 differ diff --git a/www/sounds/soundsneu/finde_kamel.mp3 b/www/sounds/soundsneu/finde_kamel.mp3 new file mode 100644 index 0000000..d0c0a72 Binary files /dev/null and b/www/sounds/soundsneu/finde_kamel.mp3 differ diff --git a/www/sounds/soundsneu/finde_katze.mp3 b/www/sounds/soundsneu/finde_katze.mp3 new file mode 100644 index 0000000..047a2e2 Binary files /dev/null and b/www/sounds/soundsneu/finde_katze.mp3 differ diff --git a/www/sounds/soundsneu/finde_krokodil.mp3 b/www/sounds/soundsneu/finde_krokodil.mp3 new file mode 100644 index 0000000..6a806b2 Binary files /dev/null and b/www/sounds/soundsneu/finde_krokodil.mp3 differ diff --git a/www/sounds/soundsneu/finde_kuh.mp3 b/www/sounds/soundsneu/finde_kuh.mp3 new file mode 100644 index 0000000..aafbe43 Binary files /dev/null and b/www/sounds/soundsneu/finde_kuh.mp3 differ diff --git a/www/sounds/soundsneu/finde_loewe.mp3 b/www/sounds/soundsneu/finde_loewe.mp3 new file mode 100644 index 0000000..c070a25 Binary files /dev/null and b/www/sounds/soundsneu/finde_loewe.mp3 differ diff --git a/www/sounds/soundsneu/finde_maus.mp3 b/www/sounds/soundsneu/finde_maus.mp3 new file mode 100644 index 0000000..70aef49 Binary files /dev/null and b/www/sounds/soundsneu/finde_maus.mp3 differ diff --git a/www/sounds/soundsneu/finde_nashorn.mp3 b/www/sounds/soundsneu/finde_nashorn.mp3 new file mode 100644 index 0000000..759f666 Binary files /dev/null and b/www/sounds/soundsneu/finde_nashorn.mp3 differ diff --git a/www/sounds/soundsneu/finde_nilpferd.mp3 b/www/sounds/soundsneu/finde_nilpferd.mp3 new file mode 100644 index 0000000..3e5c62a Binary files /dev/null and b/www/sounds/soundsneu/finde_nilpferd.mp3 differ diff --git a/www/sounds/soundsneu/finde_schaf.mp3 b/www/sounds/soundsneu/finde_schaf.mp3 new file mode 100644 index 0000000..5e1603d Binary files /dev/null and b/www/sounds/soundsneu/finde_schaf.mp3 differ diff --git a/www/sounds/soundsneu/finde_schildkroete.mp3 b/www/sounds/soundsneu/finde_schildkroete.mp3 new file mode 100644 index 0000000..15b93e5 Binary files /dev/null and b/www/sounds/soundsneu/finde_schildkroete.mp3 differ diff --git a/www/sounds/soundsneu/finde_schwein.mp3 b/www/sounds/soundsneu/finde_schwein.mp3 new file mode 100644 index 0000000..39a39b2 Binary files /dev/null and b/www/sounds/soundsneu/finde_schwein.mp3 differ diff --git a/www/sounds/soundsneu/finde_stier.mp3 b/www/sounds/soundsneu/finde_stier.mp3 new file mode 100644 index 0000000..579345c Binary files /dev/null and b/www/sounds/soundsneu/finde_stier.mp3 differ diff --git a/www/sounds/soundsneu/niederlage_1.mp3 b/www/sounds/soundsneu/niederlage_1.mp3 new file mode 100644 index 0000000..4c88088 Binary files /dev/null and b/www/sounds/soundsneu/niederlage_1.mp3 differ diff --git a/www/sounds/soundsneu/niederlage_2.mp3 b/www/sounds/soundsneu/niederlage_2.mp3 new file mode 100644 index 0000000..f1ad04a Binary files /dev/null and b/www/sounds/soundsneu/niederlage_2.mp3 differ diff --git a/www/sounds/soundsneu/niederlage_3.mp3 b/www/sounds/soundsneu/niederlage_3.mp3 new file mode 100644 index 0000000..3960fa6 Binary files /dev/null and b/www/sounds/soundsneu/niederlage_3.mp3 differ diff --git a/www/sounds/soundsneu/niederlage_4.mp3 b/www/sounds/soundsneu/niederlage_4.mp3 new file mode 100644 index 0000000..16da28d Binary files /dev/null and b/www/sounds/soundsneu/niederlage_4.mp3 differ diff --git a/www/sounds/soundsneu/niederlage_5.mp3 b/www/sounds/soundsneu/niederlage_5.mp3 new file mode 100644 index 0000000..b004daa Binary files /dev/null and b/www/sounds/soundsneu/niederlage_5.mp3 differ diff --git a/www/sounds/soundsneu/spiel_intro.mp3 b/www/sounds/soundsneu/spiel_intro.mp3 new file mode 100644 index 0000000..b89510b Binary files /dev/null and b/www/sounds/soundsneu/spiel_intro.mp3 differ diff --git a/www/templates/home.html b/www/templates/home.html index 7b26be4..8133316 100644 --- a/www/templates/home.html +++ b/www/templates/home.html @@ -1,15 +1,25 @@ -
-
- +
+
-
+ + +
+ +
+ +
+ +
+
+
+
diff --git a/www/templates/suchspiel.html b/www/templates/suchspiel.html index b34a572..918fd23 100644 --- a/www/templates/suchspiel.html +++ b/www/templates/suchspiel.html @@ -11,20 +11,25 @@
- +
+
+
+ {{ Spielzeit }} +
+
+
+ {{punkte}} +
-
- {{ Spielzeit }} -