progress bar

jmelis · Mar 26, 2011 · 0077b4b · 0077b4b
1 parent fa070b1
commit 0077b4b
Show file tree

Hide file tree

Showing 25 changed files with 1,071 additions and 372 deletions.
diff --git a/ost/Final_fermatRoom.mp3 b/ost/Final_fermatRoom.mp3
diff --git a/ost/bucleSofter_fermatRoom.mp3 b/ost/bucleSofter_fermatRoom.mp3
diff --git a/ost/bucle_fermatRoom.mp3 b/ost/bucle_fermatRoom.mp3
diff --git a/web/fermat.html b/web/fermat.html
@@ -4,9 +4,13 @@
 <html lang="es">
 <head>
 	<link rel="stylesheet" href="stylesheets/fermat.css" type="text/css" />
+	<link rel="stylesheet" href="stylesheets/jquery-ui.css" type="text/css" />
 	<script src="javascripts/jquery.min.js"></script>
-	<script src="javascripts/jquery.timers.js"></script> 
-	<script src="javascripts/application.js"></script> 
+	<script src="javascripts/jquery.timers.js"></script>
+	<script src="javascripts/jquery.ui.core.js"></script> 
+	<script src="javascripts/jquery.ui.widget.js"></script> 
+	<script src="javascripts/jquery.ui.progressbar.js"></script>
+	<script src="javascripts/application.js"></script>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<title>La Habitación de Fermat</title>
 </head>
@@ -85,6 +89,7 @@
 									<div id="code-submit">OK</div>
 									<div class="clear"></div>
 							</form>
+							<div id="progressbar"></div>
 						</div>
 					</div>
 					<div id="right-column">

diff --git a/web/javascripts/application.js b/web/javascripts/application.js
@@ -1,4 +1,5 @@
 var GAME_DURATION = 600;
+var FAIL_PENALTY = 30;
 var WINNING_QUESTIONS = 3;
 var MAX_TRIES = 3;
 
@@ -155,6 +156,11 @@ var app = {
 				else{
 					$('#code-text').val("");
 					$('#information-display p').css({color:'red'}).html('¡Respuesta incorrecta! Penalización de 30 s').fadeIn(500).fadeOut(3000);
+					$('#progressbar').everyTime(500,'gameTimer',function(i) {
+						$(this).progressbar({
+							value: i/60*100
+						}, 60);
+					});
 				}
 			}	
 			return false;
@@ -213,7 +219,19 @@ var app = {
 
 
 $(document).ready(function(){
-	app.gameBegin();
-	app.showScrollOnStartButtonClick();
-	app.showGameConsoleOnArrowClick();
+	//app.gameBegin();
+	//app.showScrollOnStartButtonClick();
+	//app.showGameConsoleOnArrowClick();
+	var stepDelay = 1000;
+	$('#progressbar').everyTime(stepDelay,'penaltyTimer',function(i) {
+		console.log(i);
+		$(this).progressbar({
+			value: 100 - i/(300)*stepDelay
+		}, 30000/stepDelay);
+	});
+	$('#scroll-wrapper').hide();
+	$('#game-console-wrapper').show();
+	$('#start-wrapper').hide();
+	$('form').hide();
+	$('#progressbar').show();
 });
diff --git a/web/javascripts/jquery-ui.js b/web/javascripts/jquery-ui.js