Merge pull request #35 from Program-AR/iteracionYvoty

Iteracion yvoty

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pilas-bloques-exercises",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "description": "Exercises for Pilas Bloques",
   "homepage": "http://pilasbloques.program.ar",
   "author": {

src/actores/segundoCiclo/Yvoty/Celular.ts

@@ -3,10 +3,11 @@ class Celular extends ActorAnimado {
     static _grilla = 'actor.celular.png'
 
     constructor(prendido = false) {
-        super(0, 0, {cantColumnas: 2});
+        super(0, 0, {cantColumnas: 3});
         this.definirAnimacion("cargado", [1], 1);
         this.definirAnimacion("prendido", [1], 1);
         this.definirAnimacion("descargado", [0], 1);
+        this.definirAnimacion("desaparecer", [2], 1);
 
         if(prendido) this.cargarAnimacion("prendido")
     }

src/actores/segundoCiclo/Yvoty/Yvoty.ts

@@ -8,23 +8,30 @@ class Yvoty extends ActorAnimado {
 		super(0, 0, { cantColumnas: 10, cantFilas: 8 });
 
 		this.definirAnimacion("parado",
-			new Cuadros(0).repetirVeces(16)
-				.concat([4, 5, 6, 7, 8, 7, 6, 5, 4, 9, 9, 9, 9, 9, 9, 9, 4, 5, 6, 7, 8, 7, 6, 5, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, 11, 12, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 13, 13, 14, 14, 14, 14, 14, 14, 14, 15, 15, 14, 14, 14, 14])
-				.concat(new Cuadros(0).repetirVeces(30))
-				.concat([4, 5, 6, 7, 8, 7, 6, 5, 4, 9, 9, 9, 9, 9, 9, 9, 4, 5, 6, 7, 8, 7, 6, 5, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, 11, 12, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 13, 13, 14, 14, 14, 14, 14, 14, 14, 15, 15, 14, 14, 14, 14])
-				.concat(new Cuadros(0).repetirVeces(30))
-				.concat([4, 5, 6, 7, 8, 7, 6, 5, 4, 9, 9, 9, 9, 9, 9, 9, 4, 5, 6, 7, 8, 7, 6, 5, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, 11, 12, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 13, 13, 14, 14, 14, 14, 14, 14, 14, 15, 15, 14, 14, 14, 14])
-				.concat(new Cuadros(0).repetirVeces(16))
-				.concat([14])
-				.concat(new Cuadros(0).repetirVeces(5)),
-			20, true);
+			new Cuadros(4).repetirVeces(1).
+				concat([5, 6, 7, 8, 7, 6, 5]).
+				concat(new Cuadros(9).repetirVeces(7)).
+				concat([4, 5, 6, 7, 8, 7, 6, 5]).
+				concat(new Cuadros(9).repetirVeces(16)).
+				concat([10, 11, 12]).
+				concat([4, 5, 6, 7, 8, 7, 6, 5]).
+				concat(new Cuadros(9).repetirVeces(7)).
+				concat([4, 5, 6, 7, 8, 7, 6, 5]).
+				concat(new Cuadros(9).repetirVeces(16)).
+				concat([10, 11, 12]).
+				concat(new Cuadros(9).repetirVeces(11)).
+				concat([13, 14, 14]).
+				concat(new Cuadros(15).repetirVeces(15)).
+				concat([14, 14, 13, 12]).
+				concat(new Cuadros(9).repetirVeces(9))
+			, 20, true);
 		this.definirAnimacion("correr", [52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71], 20);
 		this.definirAnimacion("correrChocando", [52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71], 20)
 		this.definirAnimacion("obstaculo", [20, 21, 21, 22, 23, 24, 24, 24, 24, 25, 26, 27, 28, 29, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28], 12)
 		this.definirAnimacion("error", [30, 30, 30, 30, 30, 30, 30, 31, 32, 33, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37], 12)
-		this.definirAnimacion("recoger", [0, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], 20);
+		this.definirAnimacion("recoger", [0, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 0, 0, 0], 12);
 		this.definirAnimacion("usarCelu", [38, 38, 38, 39, 39, 40, 40, 40, 41, 42, 43, 41, 43, 42, 42, 42, 44, 45, 46, 47, 46, 42, 42, 42, 45, 46, 46, 46, 45, 44, 48, 48, 48, 49, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 51, 51, 38, 38, 38, 38, 38, 38, 38], 20);
-		this.definirAnimacion("sacarFoto", [38, 38, 38, 39, 39, 40, 40, 40, 41, 42, 43, 41, 43, 42, 42, 42, 44, 45, 46, 47, 46, 42, 42, 42, 45, 46, 46, 46, 45, 44, 48, 48, 48, 49, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 51, 51, 38, 38, 38, 38, 38, 38, 38], 20);
+		this.definirAnimacion("sacarFoto", [38, 38, 38, 39, 39, 40, 40, 40, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 40, 40, 40, 40], 20);
 		this.definirAnimacion("escribir", [16, 16, 17, 17, 18, 18, 18, 19, 19, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18], 20);
 	}
 }

src/escenas/InstalandoJuegosYvoty.ts

@@ -12,6 +12,17 @@ class InstalandoJuegosYvoty extends InstalandoJuegos {
   cuadricula;
   estado;
 
+  static clasesDeActoresInvolucrados(): typeof ActorAnimado[] {
+		return [Yvoty, CompuAnimada];
+	};
+
+	static pathFondo(): string {
+		return 'fondo.yvoty.png';
+	}
+
+	static imagenesAdicionales(): string[] {
+		return Casilla.imagenesPara('yvoty').concat(Obstaculo.imagenesPara('yvoty'));
+	}
 
   colocarCuadricula(){
     this.cuadricula = new Cuadricula(0, -20, 1, 4,
@@ -32,7 +43,7 @@ class InstalandoJuegosYvoty extends InstalandoJuegos {
     this.automata = new Yvoty();
     this.cuadricula.agregarActor(this.automata, 0, 0);
 		this.automata.escala *= this.escalaSegunCuadricula(1.5);
-		this.automata.setY(0);
+		this.automata.setY(3);
     this.automata.x -= 10
   }
 

src/escenas/libroPrimaria/EscenaYvoty.ts

@@ -22,7 +22,7 @@ class EscenaYvoty extends EscenaDesdeMapa {
 	}
 
 	ajustarGraficos() {
-		this.automata.escala *= this.escalaSegunCuadricula(1.8);
+		this.automata.escala *= this.escalaSegunCuadricula(1.75);
 		this.automata.setY(this.automata.getY() + this.automata.getAlto() / 4);
 
 		this.obtenerActoresConEtiqueta("Luciernaga").forEach(actor => {