Merge branch 'master' of https://github.com/cycojesus/c-urs_-toil-s

2024-12-26 09:58:48 +01:00 · 2011-07-07 08:24:31 +02:00 · 2011-07-07 08:24:31 +02:00 · 9ed8e81e0a
commit 9ed8e81e0a
parent 62f57ef3b6 99900da161
31 changed files with 31 additions and 19 deletions
--- a/star.js/css/star.css
+++ b/star.js/css/star.css
@ -0,0 +1,11 @@
+.gstar{float:left;width:100%}
+.gstar #blackboard{width:320px;height:180px;background:#333;float:left}
+.gstar #blackboard .starcell{width:20px;height:20px;display:block;float:left;text-align:center}
+.gstar #blackboard .wall{background-image:url(../themes/HP48/tex_wall.png);color:#000}
+.gstar #blackboard .ball{background-image:url(../themes/HP48/tex_ball.png);color:#99f}
+.gstar #blackboard .cube{background-image:url(../themes/HP48/tex_cube.png);color:red}
+.gstar #blackboard .ball_selected{background-image:url(../themes/HP48/tex_ball_selected.png);color:#99f}
+.gstar #blackboard .cube_selected{background-image:url(../themes/HP48/tex_cube_selected.png);color:red}
+.gstar #blackboard .gift{background-image:url(../themes/HP48/tex_gift.png);color:yellow}
+.gstar #blackboard .void{background-image:url(../themes/HP48/tex_empty.png);}
+.gstar aside{float:left;height:140px;width:120px;padding:20px;background:#ddd}
--- a/star.js/index.html
+++ b/star.js/index.html
@ -17,32 +17,19 @@
 	<link rel="shortcut icon" href="/favicon.ico">
 	<link rel="apple-touch-icon" href="/apple-touch-icon.png">
 	<link rel="stylesheet" href="css/style.css?v=2">
+	<link rel="stylesheet" href="css/star.css">

 	<script src="js/libs/modernizr-1.7.min.js"></script>
 </head>
 <body>
 	<div id="container">
 		<header>
-		  Star5
 		</header>

 		<div id="main" role="main">
-		  <style>
-			#blackboard{width:16em;background:#333;float:left}
-			.starcell{width:1em;height:1em;display:block;float:left;text-align:center}
-			.selected{font-weight:bold}
-			.wall{color:#000}
-			.ball{color:#99f}
-			.cube{color:red}
-			.gift{color:yellow}
-			.void{}
-			.selected{background:#555}
-		  </style>
-		  <p id="blackboard"></p>
 		</div>

 		<footer>
-		  ©Gwh
 		</footer>
 	</div>

@ -60,7 +47,7 @@
 	<script src="js/star.js"></script>
 	<script>
 	  state = load_level( levels, 0 );
-	  start_loop( state, "#blackboard" );
+	  start_loop( state, "#main" );
 	  $( document ).focus();
 	</script>
 </body>
--- a/star.js/js/star.js
+++ b/star.js/js/star.js
@ -26,7 +26,7 @@ var options = {
 };
 var state = {
 	moving				: cell.BALL,
-	distance_travelled				: 0,
+	distance_travelled	: 0,
 	level				: 0,
 	board				: ""
 };
@ -95,7 +95,7 @@ function won_or_not( state ) {
 	return count_gifts( state ) === 0;
 }

-function format_level( state ) {
+function format_level( state, text ) {
 	function Replacer( conversionObject ) {

        var regexpStr = '';
@ -118,11 +118,24 @@ function format_level( state ) {
 		'H': '<span class="starcell cube">H</span>',
 		'@': '<span class="starcell ball">@</span>'
 		};
-	substitutions[ state.moving ] = substitutions[ state.moving ].replace( '">', ' selected">' );
+	substitutions[ state.moving ] = substitutions[ state.moving ].replace( '">', '_selected">' );
+	if ( text == false ) {
+		for ( var c in substitutions ) {
+			substitutions[ c ] = substitutions[ c ].replace( />.</, '><' );
+		}
+	}
 	var myReplacer = Replacer( substitutions );
 	return myReplacer( state.board );
 }

+function format_infos( state ) {
+	var infos = "<h1>Star5</h1><br />";
+	infos += "Level " + (state.level+1) + " of " + levels.length + "<br />";
+	infos += count_gifts( state ) + " gifts left<br />";
+	infos += state.distance_travelled + " meters travelled";
+	return infos;
+}
+
 function load_level( levelset, nb ) {
 	state.level = nb;
 	state.board = levelset[ state.level ];
@ -132,7 +145,8 @@ function load_level( levelset, nb ) {
 }

 function display_level( state, elt ) {
-	$( elt ).html( format_level( state ) );
+	var starhtml = '<div class="gstar"><div id="blackboard">' + format_level( state, false ) + '</div><aside id="infos">' + format_infos( state ) + '</aside></div>';
+	$( elt ).html( starhtml );
 }


--- a/star.js/themes/HP48/tex_ball.png
+++ b/star.js/themes/HP48/tex_ball.png
--- a/star.js/themes/HP48/tex_ball_selected.png
+++ b/star.js/themes/HP48/tex_ball_selected.png
--- a/star.js/themes/HP48/tex_cube.png
+++ b/star.js/themes/HP48/tex_cube.png
--- a/star.js/themes/HP48/tex_cube_selected.png
+++ b/star.js/themes/HP48/tex_cube_selected.png
--- a/star.js/themes/HP48/tex_empty.png
+++ b/star.js/themes/HP48/tex_empty.png
--- a/star.js/themes/HP48/tex_gift.png
+++ b/star.js/themes/HP48/tex_gift.png
--- a/star.js/themes/HP48/tex_wall.png
+++ b/star.js/themes/HP48/tex_wall.png
--- a/star.js/themes/cyco001/tex_ball.png
+++ b/star.js/themes/cyco001/tex_ball.png
--- a/star.js/themes/cyco001/tex_ball_selected.png
+++ b/star.js/themes/cyco001/tex_ball_selected.png
--- a/star.js/themes/cyco001/tex_cube.png
+++ b/star.js/themes/cyco001/tex_cube.png
--- a/star.js/themes/cyco001/tex_cube_selected.png
+++ b/star.js/themes/cyco001/tex_cube_selected.png
--- a/star.js/themes/cyco001/tex_empty.png
+++ b/star.js/themes/cyco001/tex_empty.png
--- a/star.js/themes/cyco001/tex_gift.png
+++ b/star.js/themes/cyco001/tex_gift.png
--- a/star.js/themes/cyco001/tex_wall.png
+++ b/star.js/themes/cyco001/tex_wall.png
--- a/star.js/themes/cyco002/tex_ball.png
+++ b/star.js/themes/cyco002/tex_ball.png
--- a/star.js/themes/cyco002/tex_ball_selected.png
+++ b/star.js/themes/cyco002/tex_ball_selected.png
--- a/star.js/themes/cyco002/tex_cube.png
+++ b/star.js/themes/cyco002/tex_cube.png
--- a/star.js/themes/cyco002/tex_cube_selected.png
+++ b/star.js/themes/cyco002/tex_cube_selected.png
--- a/star.js/themes/cyco002/tex_empty.png
+++ b/star.js/themes/cyco002/tex_empty.png
--- a/star.js/themes/cyco002/tex_gift.png
+++ b/star.js/themes/cyco002/tex_gift.png
--- a/star.js/themes/cyco002/tex_wall.png
+++ b/star.js/themes/cyco002/tex_wall.png
--- a/star.js/themes/inversed/tex_ball.png
+++ b/star.js/themes/inversed/tex_ball.png
--- a/star.js/themes/inversed/tex_ball_selected.png
+++ b/star.js/themes/inversed/tex_ball_selected.png
--- a/star.js/themes/inversed/tex_cube.png
+++ b/star.js/themes/inversed/tex_cube.png
--- a/star.js/themes/inversed/tex_cube_selected.png
+++ b/star.js/themes/inversed/tex_cube_selected.png
--- a/star.js/themes/inversed/tex_empty.png
+++ b/star.js/themes/inversed/tex_empty.png
--- a/star.js/themes/inversed/tex_gift.png
+++ b/star.js/themes/inversed/tex_gift.png
--- a/star.js/themes/inversed/tex_wall.png
+++ b/star.js/themes/inversed/tex_wall.png