fix mineurs et renommages

js/drawer.js

@@ -17,7 +17,7 @@ class Drawer
 		this.tubeSize = _tubeSize;
 		
 		this.#canvasWidth = this.tubesNumbers * (this.tubeSize + this.padding) + this.padding;
-		this.#canvasHeight = 3 * this.padding + this.tubeLevels * this.tubeSize;
+		this.#canvasHeight = 2 * this.padding + (this.tubeLevels+1) * this.tubeSize;
 		
 		resizeCanvas(this.#canvasWidth, this.#canvasHeight);
 	}
@@ -29,7 +29,7 @@ class Drawer
 		
 		background('white');
 		
-		this.drawTubes(this.padding, 2*this.padding, tubes, selectedTube);
+		this.drawTubes(this.padding, this.padding+this.tubeSize, tubes, selectedTube);
 	}
 
 	drawTubes(x, y, tubes, selectedTube)
@@ -39,7 +39,7 @@ class Drawer
 		let selectionOffset = 0;
 		
 		tubes.forEach(tube => {
-			selectionOffset = (tube == selectedTube ? this.padding : 0);
+			selectionOffset = (tube == selectedTube ? this.tubeSize : 0);
 			
 			this.drawTube(tubeX, tubeY - selectionOffset, tube);
 			tubeX += this.padding + this.tubeSize;

js/game.js

@@ -43,7 +43,7 @@ class Game {
 		for (let index = 0; index < allColors.length; index++)
 		{
 			let tubeIndex = Math.floor(index/(tubeLevel-1));
-			this.tubes[tubeIndex].addColor(allColors[index]);
+			this.tubes[tubeIndex].addColorLayer(allColors[index]);
 		}
 	}
 	
@@ -51,31 +51,27 @@ class Game {
 	{
 		let newSelectedTube = this.tubes[tubeId];
 		
-		if (this.selectedTube == null && newSelectedTube.isEmpty()) return;
-		
-		if(this.selectedTube == null && !newSelectedTube.isEmpty())
-		{
-			this.selectedTube = newSelectedTube;
-		}
-		else if (this.selectedTube == newSelectedTube)
-		{
+		if (this.selectedTube == newSelectedTube)
 			this.selectedTube = null;
-		}
-		else if (newSelectedTube.isEmpty() || this.selectedTube.peekTopColor() == newSelectedTube.peekTopColor())
-		{
+		else if (this.canPourInto(this.selectedTube, newSelectedTube))
 			this.pourColorInto(this.selectedTube, newSelectedTube);
-		}
+		else if (!newSelectedTube.isEmpty())
+			this.selectedTube = newSelectedTube;
+	}
+	
+	canPourInto(sourceTube, targetTube)
+	{
+		return sourceTube != null && targetTube != null
+			&& sourceTube != targetTube
+			&& (targetTube.isEmpty() || sourceTube.peekTopColor() == targetTube.peekTopColor())
+			&& !targetTube.isFull();
 	}
 	
 	pourColorInto(sourceTube, targetTube)
 	{
-		if (sourceTube.isEmpty()) return;
-		
-		let pouringColor = sourceTube.peekTopColor();
-		
-		while (sourceTube.peekTopColor() == pouringColor && !targetTube.isFull() && !targetTube.isComplete())
+		while (this.canPourInto(sourceTube, targetTube))
 		{
-			targetTube.addColor(sourceTube.removeColorLayer());
+			targetTube.addColorLayer(sourceTube.removeColorLayer());
 		}
 		
 		this.checkTubeCompletion(sourceTube);

js/tube.js

@@ -8,7 +8,7 @@ class Tube {
 		this.#colors = [];
 	}
 	
-	addColor(color)
+	addColorLayer(color)
 	{
 		if (this.isFull()) return false;