+
+
+
+ 
-
+
SUMME
+ SUMME
0
0
0
@@ -64,10 +70,10 @@
-
-
-
-
- +
+
+
@@ -107,6 +108,24 @@
+
+
+
+
+ Spieler 1:
+Spieler 2:
+ Frage:
+ Alternative Antwort (0 Punkte):
+
+ +
+ Frage:
+ Alternative Antwort (0 Punkte):
+
diff --git a/web/img/schweinchen1.jpg b/web/img/schweinchen1.jpg new file mode 100755 index 0000000..1f65cbb Binary files /dev/null and b/web/img/schweinchen1.jpg differ diff --git a/web/img/schweinchen2.jpg b/web/img/schweinchen2.jpg new file mode 100755 index 0000000..4da454c Binary files /dev/null and b/web/img/schweinchen2.jpg differ diff --git a/web/js/main.js b/web/js/main.js index 9c8c0fd..092038c 100644 --- a/web/js/main.js +++ b/web/js/main.js @@ -1,9 +1,9 @@ var fragen = null; var intro = null; var introVolume = 1; -var jeopardy = null; +var answerFail = null; var schweinchenVolume = 1; -var jeopardyVolume = 1; +var answerFailVolume = 1; var schweinchen = null; $(document).ready(function() { @@ -23,29 +23,40 @@ $(document).ready(function() { wsSend("toggleBlackScreen", ""); }); - $("#startJeopardybtn").click(function() { - $("#startJeopardybtn").attr("disabled", "disabled"); - wsSend("startJeopardy", ""); + $("#modeFinal").change(function() { + var status = $('#modeFinal').is(':checked'); + wsSend("toggleFinalMode", status); }); - $("#stopJeopardybtn").click(function() { - $("#startJeopardybtn").removeAttr("disabled"); - wsSend("stopJeopardy", ""); + $(".playerTgl").change(function() { + var player = $(this).val() == 1 ? false : true; + wsSend("setPlayer2ForFinalMode", player); }); - $("#jeopardyVolume").on("input", function() { + $("#startAnswerFailBtn").click(function() { + wsSend("startAnswerFail", ""); + }); + + $("#answerFailVolume").on("input", function() { var v = parseFloat($(this).val()) / 10; - wsSend("setJeopardyVolume", v); + wsSend("setAnswerFailVolume", v); }); - $("#startScheinchenbtn").click(function() { - $("#startScheinchenbtn").attr("disabled", "disabled"); - wsSend("startSchweinchen", ""); + $("button[id^='startScheinchenbtn']").each(function(){ + $(this).click(function() { + var status = $(this).attr('value'); + console.log('status' + status); + wsSend("setRunde", status); + $(this).attr("disabled", "disabled"); + wsSend("startSchweinchen", ""); + }); }); - $("#stopScheinchenbtn").click(function() { - $("#startScheinchenbtn").removeAttr("disabled"); - wsSend("stopSchweinchen", ""); + $("#stopScheinchenbtn").click(function() { + $("button[id^='startScheinchenbtn']").each(function(){ + $(this).removeAttr("disabled"); + }); + wsSend("stopSchweinchen", ""); }); $("#schweinchenVolume").on("input", function() { @@ -121,8 +132,39 @@ $(document).ready(function() { wsSend("setRightPoints", $("#mPunkteRight").val()); }); + $("#alternateAnswerBtn").click(function(){ + var is = $("#finalFragenSelect").val(); + var answer = $("#alternateAnswer").val(); + wsSend("setAnswer", is+"###"+answer); + }); + + $("#alternateAnswerPBtn").click(function(){ + var is = $("#finalFragenSelect").val(); + wsSend("setAnz", is+"###0"); + }); + + $("#finalmodusInfoBtn").click(function(){ + alert("Im Finalmodus geklickte Antworten und Punkte werden nur auf dem Display angezeigt!") + }); }); +function setFinalMode(status){ + isFinalMode = status == "true" ? true : false; + $(".finalElement").attr("disabled", !isFinalMode); + var index = $("#questionsSelcet>option:selected").index(); + index = index > 0 ? index : 0; + loadQuestionToGui(index); +} + +function setPlayer2(value){ + value = value == "true" ? true : false; + player2 = value; +} + +function setRunde(value){ + runde = value; +} + function showQuestionsAsPrint() { var ges = '
Familienduell Fragen
- ';
for(var i=0;i
'+(i+1)+'.
'+
- ''+
- ''+
- '' +
+ '
');
+ } else {
+ var oneLine = $('' + (i + 1) + '.
' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '
');
+ }
+ if(display && !player2) {
+ if (isFinalMode) {
+ oneLine.find(".answer").text("_ _ _ _ _ _ _ _ _ _ _");
+ } else {
+ oneLine.find(".answer").text("_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _");
+ }
oneLine.find(".points").text("--");
- } else {
+ if (isFinalMode){
+ oneLine.find(".points_player2").text("--");
+ oneLine.find(".answer_player2").text("_ _ _ _ _ _ _ _ _ _ _");
+ }
+ } else if (!display) {
oneLine.find(".answer").html(''+getAnswerString(fragen[index]["antworten"][i]["antwort"])+'');
oneLine.find(".points").html(''+fragen[index]["antworten"][i]["anz"]+'');
(function() {
var is = i;
+ var is2 = i;
var frage = fragen[index];
oneLine.find(".answer").click(function() {
- wsSend("setAnswer", is+"###"+frage["antworten"][is]["antwort"]);
+ if (isFinalMode){
+ is = $("#finalFragenSelect").val();
+ }
+ wsSend("setAnswer", is+"###"+frage["antworten"][is2]["antwort"]);
});
oneLine.find(".points").click(function() {
- wsSend("setAnz", is+"###"+frage["antworten"][is]["anz"]);
+ if (isFinalMode){
+ is = $("#finalFragenSelect").val();
+ }
+ wsSend("setAnz", is+"###"+frage["antworten"][is2]["anz"]);
});
})();
}
@@ -264,36 +354,85 @@ function loadQuestionToGui(index) {
}
}
}
- $("#SumRes").text("0");
- recalcSum(0);
+ if (!isFinalMode) {
+ $("#SumRes").text("0");
+ }
+ if(!display)
+ $("#resultFinal").hide();
+
+ if (isFinalMode){
+ if (!player2) {
+ $('#SumRes_player1').html("0");
+ $('#SumRes_player2').html("0");
+ }
+ }
+ if (!player2) {
+ recalcSum(0);
+ }
}
function setAnswer(index, answer) {
- answer = getAnswerString(answer);
- var el = $($("#answers").find(".answer")[index]);
- el.empty();
- if(sounds && (display || serverSound)) {
- audio = new Audio('./sounds/textRichtig.mp3');
- audio.play();
+ if(!(isFinalMode && !display)) { //not do it at final mode and controller
+ var answer_select = ".answer";
+ if (player2){
+ answer_select = '.answer_player2';
+ }
+ answer = getAnswerString(answer);
+ var el = $($("#answers").find(answer_select)[index]);
+ el.empty();
+ if(sounds && (display || serverSound)) {
+ audio = new Audio('./sounds/textRichtig.mp3');
+ audio.play();
+ }
+ el.typed({
+ strings: [answer],
+ typeSpeed: 10,
+ showCursor: false,
+ cursorChar: "",
+ fadeOut: true,
+ fadeOutDelay: 0,
+ });
}
- el.typed({
- strings: [answer],
- typeSpeed: 20
- });
}
function setAnz(index, nr) {
- var el = $($("#answers").find(".points")[index]);
- el.text(nr);
- if(sounds && (display || serverSound)) {
- audio = new Audio('./sounds/zahlRichtig.mp3');
- audio.play();
+ if(!(isFinalMode && !display)) { //not do it at final mode and controller
+ var points_select = ".points";
+ if (player2){
+ points_select = '.points_player2';
+ }
+ var el = $($("#answers").find(points_select)[index]);
+ el.text(nr);
+ if(sounds && (display || serverSound)) {
+ audio = new Audio('./sounds/zahlRichtig.mp3');
+ audio.play();
+ }
+ recalcSum(nr);
}
- recalcSum(nr);
}
function recalcSum(s) {
- $("#SumRes").text(parseFloat($("#SumRes").text())+parseFloat(s));
+ var sum_selector = '#SumRes';
+ if (isFinalMode) {
+ var p1p = 0;
+ var p2p = 0;
+ $.each($(".points"), function() {
+ var v = $(this).text();
+ if(v != "--") {
+ p1p = p1p + parseFloat(v);
+ }
+ });
+ $.each($(".points_player2"), function() {
+ var v = $(this).text();
+ if(v != "--") {
+ p2p = p2p + parseFloat(v);
+ }
+ });
+ $("#SumRes_player1").text(p1p);
+ $("#SumRes_player2").text(p2p);
+ } else {
+ $(sum_selector).text(parseFloat($(sum_selector).text())+parseFloat(s));
+ }
}
function getAnswerString(str) {
@@ -302,7 +441,11 @@ function getAnswerString(str) {
str+="_";
}
anz = str.length;
- while(str.length < 40) {
+ var maxLength = 40;
+ if (isFinalMode){
+ maxLength = 20;
+ }
+ while(str.length < maxLength) {
str+= " _";
}
return str;
diff --git a/web/js/typed.js b/web/js/typed.js
index 947dd00..8dd150f 100644
--- a/web/js/typed.js
+++ b/web/js/typed.js
@@ -1,6 +1,6 @@
// The MIT License (MIT)
-// Typed.js | Copyright (c) 2014 Matt Boldt | www.mattboldt.com
+// Typed.js | Copyright (c) 2016 Matt Boldt | www.mattboldt.com
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -23,19 +23,37 @@
-!function($){
+! function(window, document, $) {
"use strict";
- var Typed = function(el, options){
+ var Typed = function(el, options) {
+ var self = this;
// chosen element to manipulate text
- this.el = $(el);
+ this.el = el;
+
// options
- this.options = $.extend({}, $.fn.typed.defaults, options);
+ this.options = {};
+ Object.keys(defaults).forEach(function(key) {
+ self.options[key] = defaults[key];
+ });
+ Object.keys(options).forEach(function(key) {
+ self.options[key] = options[key];
+ });
+
+ // attribute to type into
+ this.isInput = this.el.tagName.toLowerCase() === 'input';
+ this.attr = this.options.attr;
+
+ // show cursor
+ this.showCursor = this.isInput ? false : this.options.showCursor;
// text content of element
- this.text = this.el.text();
+ this.elContent = this.attr ? this.el.getAttribute(this.attr) : this.el.textContent;
+
+ // html or plain text
+ this.contentType = this.options.contentType;
// typing speed
this.typeSpeed = this.options.typeSpeed;
@@ -49,6 +67,18 @@
// amount of time to wait before backspacing
this.backDelay = this.options.backDelay;
+ // Fade out instead of backspace
+ this.fadeOut = this.options.fadeOut;
+ this.fadeOutClass = this.options.fadeOutClass;
+ this.fadeOutDelay = this.options.fadeOutDelay;
+
+ // div containing strings
+ if($ && this.options.stringsElement instanceof $) {
+ this.stringsElement = this.options.stringsElement[0]
+ } else {
+ this.stringsElement = this.options.stringsElement;
+ }
+
// input strings of text
this.strings = this.options.strings;
@@ -58,9 +88,6 @@
// current array position
this.arrayPos = 0;
- // current string based on current values[] array position
- this.string = this.strings[this.arrayPos];
-
// number to stop backspacing on.
// default 0, can change depending on how many chars
// you want to remove at the time
@@ -69,209 +96,423 @@
// Looping logic
this.loop = this.options.loop;
this.loopCount = this.options.loopCount;
- this.curLoop = 1;
- if (this.loop === false){
- // number in which to stop going through array
- // set to strings[] array (length - 1) to stop deleting after last string is typed
- this.stopArray = this.strings.length-1;
- }
- else{
- this.stopArray = this.strings.length;
- }
+ this.curLoop = 0;
+
+ // for stopping
+ this.stop = false;
+
+ // custom cursor
+ this.cursorChar = this.options.cursorChar;
+
+ // shuffle the strings
+ this.shuffle = this.options.shuffle;
+ // the order of strings
+ this.sequence = [];
// All systems go!
this.build();
- }
+ };
- Typed.prototype = {
+ Typed.prototype = {
- constructor: Typed
+ constructor: Typed,
- , init: function(){
- // begin the loop w/ first current string (global self.string)
- // current string will be passed as an argument each time after this
- var self = this;
- setTimeout(function() {
- // Start typing
- self.typewrite(self.string, self.strPos)
- }, self.startDelay);
+ init: function() {
+ // begin the loop w/ first current string (global self.strings)
+ // current string will be passed as an argument each time after this
+ var self = this;
+ self.timeout = setTimeout(function() {
+ for (var i=0;i