From 656ba3570ceb30c46dcd057c77f440b12b09b3b3 Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Tue, 5 Mar 2024 22:25:09 +0100
Subject: [PATCH] tweaking

---
 css/index.css |   5 --
 css/star.css  |   4 --
 css/style.css | 141 --------------------------------------------------
 index.html    |  55 +++++++++++++++++---
 js/star.js    |  50 ++++++------------
 5 files changed, 66 insertions(+), 189 deletions(-)
 delete mode 100644 css/index.css
 delete mode 100644 css/star.css
 delete mode 100644 css/style.css

diff --git a/css/index.css b/css/index.css
deleted file mode 100644
index ce5987c..0000000
--- a/css/index.css
+++ /dev/null
@@ -1,5 +0,0 @@
-body{background-color:#baddad}
-#container header, #container #main, #container footer{float:left;width:100%}
-#container header{font-size:3em;text-align:center}
-#container footer{font-size:0.8em;color:#555;text-align:right;background:#a9cc9c;border-top:1px solid #98bb8b;position:fixed;bottom:0}
-#container .gstar{margin:128px auto 0;border:2px solid #98bb8b}
diff --git a/css/star.css b/css/star.css
deleted file mode 100644
index c710693..0000000
--- a/css/star.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.gstar{width:660px;height:180px}
-.gstar em{font-weight:bold}
-.gstar #starboard{width:320px;height:180px;background:#333;float:left}
-.gstar aside{float:left;height:140px;width:130px;padding:20px;background:#ddd}
diff --git a/css/style.css b/css/style.css
deleted file mode 100644
index d36e5cb..0000000
--- a/css/style.css
+++ /dev/null
@@ -1,141 +0,0 @@
-
-/* ==== Scroll down to find where to put your styles :) ==== */
-
-/*  HTML5 ✰ Boilerplate  */
-
-html, body, div, span, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block;
-}
-
-blockquote, q { quotes: none; }
-blockquote:before, blockquote:after,
-q:before, q:after { content: ''; content: none; }
-ins { background-color: #ff9; color: #000; text-decoration: none; }
-mark { background-color: #ff9; color: #000; font-style: italic; font-weight: bold; }
-del { text-decoration: line-through; }
-abbr[title], dfn[title] { border-bottom: 1px dotted; cursor: help; }
-table { border-collapse: collapse; border-spacing: 0; }
-hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
-input, select { vertical-align: middle; }
-
-body { font:13px/1.231 sans-serif; *font-size:small; } 
-select, input, textarea, button { font:99% sans-serif; }
-pre, code, kbd, samp { font-family: monospace, sans-serif; }
-
-html { overflow-y: scroll; }
-a:hover, a:active { outline: none; }
-ul, ol { margin-left: 2em; }
-ol { list-style-type: decimal; }
-nav ul, nav li { margin: 0; list-style:none; list-style-image: none; }
-small { font-size: 85%; }
-strong, th { font-weight: bold; }
-td { vertical-align: top; }
-
-sub, sup { font-size: 75%; line-height: 0; position: relative; }
-sup { top: -0.5em; }
-sub { bottom: -0.25em; }
-
-pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; padding: 15px; }
-textarea { overflow: auto; }
-.ie6 legend, .ie7 legend { margin-left: -7px; } 
-input[type="radio"] { vertical-align: text-bottom; }
-input[type="checkbox"] { vertical-align: bottom; }
-.ie7 input[type="checkbox"] { vertical-align: baseline; }
-.ie6 input { vertical-align: text-bottom; }
-label, input[type="button"], input[type="submit"], input[type="image"], button { cursor: pointer; }
-button, input, select, textarea { margin: 0; }
-input:valid, textarea:valid   {  }
-input:invalid, textarea:invalid { border-radius: 1px; -moz-box-shadow: 0px 0px 5px red; -webkit-box-shadow: 0px 0px 5px red; box-shadow: 0px 0px 5px red; }
-.no-boxshadow input:invalid, .no-boxshadow textarea:invalid { background-color: #f0dddd; }
-
-::-moz-selection{ background: #FF5E99; color:#fff; text-shadow: none; }
-::selection { background:#FF5E99; color:#fff; text-shadow: none; }
-a:link { -webkit-tap-highlight-color: #FF5E99; }
-
-button {  width: auto; overflow: visible; }
-.ie7 img { -ms-interpolation-mode: bicubic; }
-
-body, select, input, textarea {  color: #444; }
-h1, h2, h3, h4, h5, h6 { font-weight: bold; }
-a, a:active, a:visited { color: #607890; }
-a:hover { color: #036; }
-
-/*
-    // ========================================== \\
-   ||                                              ||
-   ||               Your styles !                  ||
-   ||                                              ||
-    \\ ========================================== //
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-.ir { display: block; text-indent: -999em; overflow: hidden; background-repeat: no-repeat; text-align: left; direction: ltr; }
-.hidden { display: none; visibility: hidden; }
-.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
-.visuallyhidden.focusable:active,
-.visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; }
-.invisible { visibility: hidden; }
-.clearfix:before, .clearfix:after { content: "\0020"; display: block; height: 0; overflow: hidden; }
-.clearfix:after { clear: both; }
-.clearfix { zoom: 1; }
-
-
-@media all and (orientation:portrait) {
-
-}
-
-@media all and (orientation:landscape) {
-
-}
-
-@media screen and (max-device-width: 480px) {
-
-  /* html { -webkit-text-size-adjust:none; -ms-text-size-adjust:none; } */
-}
-
-
-@media print {
-  * { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important;
-  -ms-filter: none !important; } 
-  a, a:visited { color: #444 !important; text-decoration: underline; }
-  a[href]:after { content: " (" attr(href) ")"; }
-  abbr[title]:after { content: " (" attr(title) ")"; }
-  .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; }  
-  pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
-  thead { display: table-header-group; }
-  tr, img { page-break-inside: avoid; }
-  @page { margin: 0.5cm; }
-  p, h2, h3 { orphans: 3; widows: 3; }
-  h2, h3{ page-break-after: avoid; }
-}
\ No newline at end of file
diff --git a/index.html b/index.html
index 24850ad..d93d3ab 100644
--- a/index.html
+++ b/index.html
@@ -9,10 +9,53 @@
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-	<link rel="stylesheet" href="css/style.css?v=2">
-	<link rel="stylesheet" href="css/star.css">
-	<link rel="stylesheet" href="css/star_HP48.css">
-	<link rel="stylesheet" href="css/index.css">
+	<style>
+		body {
+		    background-color:#baddad;
+		    font-family: sans-serif;
+		    font-size: 0.8em;
+		}
+		#container header, #container #jsstar, #container footer {
+		    float: left;
+		    width: 100%;
+		}
+		#container header {
+		    font-size: 3em;
+		    text-align: center;
+		}
+		#container footer {
+		    font-size: 0.8em;
+		    color: #555;
+		    text-align: right;
+		    background: #a9cc9c;
+		    border-top: 1px solid #98bb8b;
+		    position: fixed;
+		    bottom: 0;
+		}
+		#container .gstar {
+		    margin: 128px auto 0;
+		    border: 2px solid #98bb8b;
+		}
+
+		.gstar {
+		    width: 660px;
+		    height: 180px;
+		}
+		.gstar em { font-weight: bold; }
+		.gstar #starboard {
+		    width: 320px;
+		    height: 180px;
+		    background: #333;
+		    float: left;
+		}
+		.gstar aside {
+		    float: left;
+		    height: 140px;
+		    width: 130px;
+		    padding: 20px;
+		    background: #ddd;
+		}
+	</style>
 </head>
 <body>
 	<div id="container">
@@ -20,7 +63,7 @@
 		  Cœurs étoilés
 		</header>
 
-		<div id="main" role="main">
+		<div id="jsstar" role="main">
 		</div>
 
 		<footer>
@@ -30,7 +73,7 @@
 
 	<script src="js/star.js"></script>
 	<script>
-		initialize_a_star( "#main", 0, "cyco002" );
+		initialize_a_star( "#jsstar", "cyco002" );
 	</script>
 </body>
 </html>
diff --git a/js/star.js b/js/star.js
index 93629ef..e120a07 100644
--- a/js/star.js
+++ b/js/star.js
@@ -1,4 +1,4 @@
-let initialize_a_star = ( dom_container, level_index, theme ) => {
+let initialize_a_star = ( dom_container, theme ) => {
 	// kinda enums
 	let cell = { WALL: '#', BALL: '@', CUBE: 'H', EMPTY: ' ', GIFT: 'x' }
 	let direction = { UP: 38, DOWN: 40, LEFT: 37, RIGHT: 39 }
@@ -34,15 +34,7 @@ let initialize_a_star = ( dom_container, level_index, theme ) => {
 	}
 
 	////// FUNCTIONS //////
-	let count_gifts = () => {
-		let n = 0
-		for ( let i = level_infos.height * level_infos.width ; i-- ; ) {
-			if ( state.board[ i ] == cell.GIFT ) {
-				n++
-			}
-		}
-		return n
-	}
+	let count_gifts = () => (state.board.match( new RegExp( cell.GIFT, 'g' ) ) || []).length
 
 	let get_pos = ( actor ) => {
 		let p = state.board.indexOf( actor, state.board )
@@ -53,29 +45,23 @@ let initialize_a_star = ( dom_container, level_index, theme ) => {
 		return pos
 	}
 
-	let get_cell = ( x, y ) => {
-		return state.board[ x + ( y * level_infos.width ) ]
-	}
+	let get_cell = ( x, y ) => state.board[ x + ( y * level_infos.width ) ]
 
 	let set_cell = ( x, y, value ) => {
 		let p = x + ( y * level_infos.width )
 		state.board = [ state.board.substring( 0, p ), value, state.board.substring( p+1, state.board.length ) ].join( '' )
 	}
 
-	let switch_actor = () => {
-		state.moving = ( state.moving == cell.BALL ) ? cell.CUBE : cell.BALL
-	}
+	let switch_actor = () => state.moving = ( state.moving == cell.BALL ) ? cell.CUBE : cell.BALL
 
-	let won_or_not = () => {
-		return count_gifts() === 0
-	}
+	let won_or_not = () => count_gifts() === 0
 
 	let load_level = ( index ) => {
 		return( { moving:             cell.BALL,
-					distance_travelled: 0,
-					level:              index,
-					board:              assets.levels[ index ],
-					it_s_over:          false } )
+							distance_travelled: 0,
+							level:              index,
+							board:              assets.levels[ index ],
+							it_s_over:          false } )
 	}
 
 	let make_a_move = ( where ) => {
@@ -125,6 +111,7 @@ let initialize_a_star = ( dom_container, level_index, theme ) => {
 
 			set_cell( item_coord[ 0 ], item_coord[ 1 ], state.moving ) /* move actor into target cell */
 		}
+
 		return path
 	}
 
@@ -147,13 +134,11 @@ let initialize_a_star = ( dom_container, level_index, theme ) => {
 		assets.sprites.gift.src = "themes/" + theme + "/tex_gift.png"
 	}
 
-	let draw_cell = ( sprite, x, y ) => {
-		DOM_infos.canvas.context.drawImage( sprite,
-											x * level_infos.cell.width,
-											y * level_infos.cell.height,
-											level_infos.cell.width,
-											level_infos.cell.height )
-	}
+	let draw_cell = ( sprite, x, y ) => DOM_infos.canvas.context.drawImage( sprite,
+																																					x * level_infos.cell.width,
+																																					y * level_infos.cell.height,
+																																					level_infos.cell.width,
+																																					level_infos.cell.height )
 
 	let display_switch_actor = () => {
 		let ball_pos = get_pos( cell.BALL )
@@ -221,6 +206,7 @@ let initialize_a_star = ( dom_container, level_index, theme ) => {
 
 			state.distance_travelled++                /* increment distance_travelled */
 		}
+
 		update_infos()
 	}
 
@@ -334,9 +320,7 @@ let initialize_a_star = ( dom_container, level_index, theme ) => {
 		}
 	}
 
-	let state = load_level( ( level_index === undefined ) ? 0 :
-							( level_index >= assets.levels.length ) ? assets.levels.length - 1 :
-							( level_index < 0 ) ? 0 : level_index )
+	let state = load_level( 0 )
 
 	// kinda ugly workaround around a mysterious bug causing the canvas
 	// not to refresh the first time (before any event)