diff --git a/assets/video/aprovar.mp4 b/assets/video/aprovar.mp4 new file mode 100644 index 0000000..d111a54 Binary files /dev/null and b/assets/video/aprovar.mp4 differ diff --git a/assets/video/desaprovar.mp4 b/assets/video/desaprovar.mp4 new file mode 100644 index 0000000..40730f8 Binary files /dev/null and b/assets/video/desaprovar.mp4 differ diff --git a/css/style.css b/css/style.css index 34824bf..b6f590b 100644 --- a/css/style.css +++ b/css/style.css @@ -53,6 +53,15 @@ body { font-size: 25px; } +.floatleft { + position: absolute; + left: 2%; + top: 5%; + width: 20%; + + display: none; +} + #wrong { background-color: black; display: none; diff --git a/index.html b/index.html index e0e91ec..a0e6d8c 100644 --- a/index.html +++ b/index.html @@ -37,11 +37,21 @@ d - +

The Social Credit Score Game

+
+ +
+
+ +
diff --git a/js/main.js b/js/main.js index d7030d5..57316d9 100644 --- a/js/main.js +++ b/js/main.js @@ -29,7 +29,7 @@ $("#playBegin").click(function () { $(this).fadeOut(); }); var data = {}, cQuestion = {}, indexeslist = [], indexesProgress = 0, total = 100; -$.getJSON("data.json", function (d) { +$.getJSON("https://matmasit.github.io/SocialCreditScoreGame/data.json", function (d) { data = d; total = d["initialScore"]; $("#counter").html("Social credit score: " + total); @@ -49,6 +49,18 @@ function displayQuestion() { } else { var index = 0; + + // sends comrad Dwayne to help (or calls him back) + if (total > 4000 ) { + $("#rock-approves").hide(); + $("#rock-disapproves").hide(); + } + else{ + $("#rock-approves-video").get(0).currentTime = 0; + $("#rock-approves").show(); + } + // ************************************** + if (indexesProgress < indexeslist.length) { index = indexeslist[indexesProgress]; indexesProgress++; @@ -68,6 +80,31 @@ function displayQuestion() { $("#questionTitle").html(data["questions"][index]["title"]); } } + +// comrad Dwaynes feedback ************************* +$(".ans").mouseenter(function(){ + var res = cQuestion["answers"][$(this).attr("data-ans") - 1]["effect"]; + + if ( ( total <= 4000 ) && ( res < 0 ) ) { + $("#rock-approves").hide(); + $("#rock-disapproves").show(); + $("#rock-disapproves-video").get(0).currentTime = 0; + $("#rock-disapproves-video").get(0).play(); + } + +}); +$(".ans").mouseleave(function(){ + var res = cQuestion["answers"][$(this).attr("data-ans") - 1]["effect"]; + + if ( ( total <= 4000 ) && ( res < 0 ) ) { + $("#rock-disapproves").hide(); + $("#rock-approves").show(); + $("#rock-approves-video").get(0).currentTime = 0; + $("#rock-approves-video").get(0).play(); + } +}); +// ***8888888************************************8 + $(".ans").click(function () { var res = cQuestion["answers"][$(this).attr("data-ans") - 1]["effect"]; total += res;