diff --git a/web/duell.html b/web/duell.html
index 6aedab1..310a9a4 100644
--- a/web/duell.html
+++ b/web/duell.html
@@ -23,7 +23,7 @@
-
+
@@ -66,6 +66,7 @@
Server |
Intro |
Jeopardy |
+
Schweinchen |
Clear Fails |
Punkte |
@@ -87,6 +88,13 @@

+
+
+
+
+
+
+ |
|
diff --git a/web/img/schweinchen.jpg b/web/img/schweinchen.jpg
new file mode 100644
index 0000000..69312be
Binary files /dev/null and b/web/img/schweinchen.jpg differ
diff --git a/web/js/main.js b/web/js/main.js
index 1125be4..d3b5c6e 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -1,6 +1,9 @@
var fragen = null;
var intro = null;
var jeopardy = null;
+var schweinchenVolume = 1;
+var jeopardyVolume = 1;
+var schweinchen = null;
$(document).ready(function() {
@@ -38,6 +41,21 @@ $(document).ready(function() {
wsSend("setJeopardyVolume", v);
});
+ $("#startScheinchenbtn").click(function() {
+ $("#startScheinchenbtn").attr("disabled", "disabled");
+ wsSend("startSchweinchen", "");
+ });
+
+ $("#stopScheinchenbtn").click(function() {
+ $("#startScheinchenbtn").removeAttr("disabled");
+ wsSend("stopSchweinchen", "");
+ });
+
+ $("#schweinchenVolume").on("input", function() {
+ var v = parseFloat($(this).val()) / 10;
+ wsSend("setSchweinchenVolume", v);
+ });
+
$("#addNewQuestionBtn").click(function() {
addNewQuestion(null);
});
@@ -136,6 +154,7 @@ function setRightPoints(newPoints) {
function startJeopardy() {
if(sounds && (display || serverSound)) {
jeopardy = new Audio('./sounds/jeopardy.mp3');
+ jeopardy.volume = jeopardyVolume;
jeopardy.play();
}
}
@@ -146,6 +165,28 @@ function stopJeopardy() {
}
}
+function startSchweinchen() {
+ $("#schweinchenImg").show();
+ $("#answers").hide();
+ if(sounds && (display || serverSound)) {
+ schweinchen = new Audio('./sounds/schweinchen.wav');
+ schweinchen.volume = schweinchenVolume;
+ schweinchen.play();
+ }
+}
+
+function stopSchweinchen() {
+ var index = $("#questionsSelcet>option:selected").index();
+ $("#questionsSelcet").val(index+1);
+ changeFrage();
+
+ $("#schweinchenImg").hide();
+ $("#answers").show();
+ if(schweinchen) {
+ schweinchen.pause();
+ }
+}
+
function hideIntro() {
$(".noIntro").show();
$(".intro").hide();
@@ -166,7 +207,7 @@ function showIntro() {
function fillFragenSelect() {
$("#questionsSelcet").empty();
for(var i=0;i
'+fragen[i]["kuerzel"]+'');
+ $("#questionsSelcet").append('');
}
}
@@ -188,6 +229,7 @@ function changeFrage() {
}
function loadQuestionToGui(index) {
+ $("#schweinchenImg").hide();
$("#answers").empty();
if(index > -1) {
$("#frageDiv").text("Frage: "+fragen[index]["frage"]);
diff --git a/web/js/websocket.js b/web/js/websocket.js
index afb4f2a..082923c 100644
--- a/web/js/websocket.js
+++ b/web/js/websocket.js
@@ -133,15 +133,22 @@ var connectWs = function() {
} else if(key == "stopJeopardy") {
stopJeopardy();
} else if(key == "setJeopardyVolume") {
+ jeopardyVolume = value;
if(jeopardy != null)
- jeopardy.volume = value;
+ jeopardy.volume = jeopardyVolume;
+ } else if(key == "startSchweinchen") {
+ startSchweinchen();
+ } else if(key == "stopSchweinchen") {
+ stopSchweinchen();
+ } else if(key == "setSchweinchenVolume") {
+ schweinchenVolume = value;
+ if(schweinchen != null)
+ schweinchen.volume = schweinchenVolume;
} else if(key == "toggleBlackScreen") {
if(display) {
$("#blackScreen").toggle();
}
}
-
-
}
}
diff --git a/web/sounds/schweinchen.wav b/web/sounds/schweinchen.wav
new file mode 100644
index 0000000..ef3ba53
Binary files /dev/null and b/web/sounds/schweinchen.wav differ