fix merge

Program-AR · Nov 7, 2023 · d9276f3 · d9276f3
2 parents ab79f4e + 939756e
commit d9276f3
Show file tree

Hide file tree

Showing 3 changed files with 222 additions and 48 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,10 @@
 {
   "name": "pilas-bloques-exercises",
+<<<<<<< HEAD
   "version": "1.4.18",
+=======
+  "version": "1.4.17",
+>>>>>>> master
   "description": "Exercises for Pilas Bloques",
   "homepage": "http://pilasbloques.program.ar",
   "author": {

diff --git a/src/escenas/ReciclandoPapeles.ts b/src/escenas/ReciclandoPapeles.ts
@@ -55,17 +55,15 @@ class ReciclandoPapeles extends EscenaActividad {
   }
 
   estaResueltoElProblema(){
-    return this.hayTachosLlenosAlFinalDeLasFilas() && this.cuadricula.cantFilas === this.cantidadDeTachosLlenos() && !this.cantidadDePapelesSinLevantar();
+    return this.hayTachosLlenosAlFinalDeLasFilas() && this.cuadricula.cantFilas === this.cantidadDeTachosLlenos() && !this.hayPapelesSinLevantar();
   }
 
   hayTachosLlenosAlFinalDeLasFilas(){
     return this.tachos.every( tacho => tacho.subactores[0].estaLleno() );
   }
 
-  cantidadDePapelesSinLevantar(): number {
-    var cant: number = 0;
-    this.papeles.forEach( papel => cant += papel.subactores[0].vivo );
-    return cant;
+  hayPapelesSinLevantar(): boolean {
+    return this.papeles.every( papel => papel.subactores[0].vivo );
   }
 
   cantidadDeTachosLlenos(): number {