Cerca del final

pdepjm · Nov 13, 2024 · 636e3c0 · 636e3c0
1 parent 5efb31d
commit 636e3c0
Show file tree

Hide file tree

Showing 25 changed files with 19 additions and 15 deletions.
diff --git a/assets/GATO1.jpg b/assets/GATO1.jpg
diff --git a/assets/GATO2.jpg b/assets/GATO2.jpg
diff --git a/assets/GATO3.jpg b/assets/GATO3.jpg
diff --git a/assets/GATO4.jpg b/assets/GATO4.jpg
diff --git a/assets/GOLPE1.jpg b/assets/GOLPE1.jpg
diff --git a/assets/GOLPE2.jpg b/assets/GOLPE2.jpg
diff --git a/assets/GOLPE3.jpg b/assets/GOLPE3.jpg
diff --git a/assets/GOLPE4.jpg b/assets/GOLPE4.jpg
diff --git a/assets/GOLPE5.jpg b/assets/GOLPE5.jpg
diff --git a/assets/GOLPE6.jpg b/assets/GOLPE6.jpg
diff --git a/assets/MUERTE1.jpg b/assets/MUERTE1.jpg
diff --git a/assets/MUERTE2.jpg b/assets/MUERTE2.jpg
diff --git a/assets/MUERTE3.jpg b/assets/MUERTE3.jpg
diff --git a/assets/MUERTE4.jpg b/assets/MUERTE4.jpg
diff --git a/assets/MUERTE5.jpg b/assets/MUERTE5.jpg
diff --git a/assets/PERRO1.jpg b/assets/PERRO1.jpg
diff --git a/assets/PERRO2.jpg b/assets/PERRO2.jpg
diff --git a/assets/PERRO3.jpg b/assets/PERRO3.jpg
diff --git a/assets/PERRO4.jpg b/assets/PERRO4.jpg
diff --git a/assets/ladrido.png b/assets/ladrido.png
diff --git a/ataques.wlk b/ataques.wlk
@@ -41,8 +41,8 @@ const proyectilL7 = new Proyectil(posicionInicial = new PositionMejorada(x = 32,
 const proyectilL8 = new Proyectil(posicionInicial = new PositionMejorada(x = 32, y = 4), id = "L8", velocidad = 100, delay = 300, sentido = dirIzquierda)
 const proyectilL9 = new Proyectil(posicionInicial = new PositionMejorada(x = 32, y = 5), id = "L9", velocidad = 100, delay = 300, sentido = dirIzquierda)
 
-const proyectilR10 = new Proyectil(posicionInicial = new PositionMejorada(x = 0, y = 2), id = "R10", velocidad = 100, delay = 1000, sentido = dirDerecha)
-const proyectilR11 = new Proyectil(posicionInicial = new PositionMejorada(x = 0, y = 7), id = "R11", velocidad = 100, delay = 1000, sentido = dirDerecha)
+const proyectilR10 = new Proyectil(posicionInicial = new PositionMejorada(x = 0, y = 2), id = "R10", velocidad = 150, delay = 1200, sentido = dirDerecha)
+const proyectilR11 = new Proyectil(posicionInicial = new PositionMejorada(x = 0, y = 7), id = "R11", velocidad = 150, delay = 1200, sentido = dirDerecha)
 
 class Ataque {
     const proyectiles

diff --git a/entorno.wlk b/entorno.wlk
@@ -43,16 +43,16 @@ object entorno {
     }
 
     method reiniciarJuego() {
-        const personajes = [morcilla, jefePerro, jefeGato, jefeFinal]
+        // const personajes = [morcilla, jefePerro, jefeGato, jefeFinal]
 
-        jefesDerrotados = 0
+        // jefesDerrotados = 0
 
-        self.limpiarEntorno()
+        // self.limpiarEntorno()
 
-        personajes.forEach({personaje => personaje.estadoInicial()}) // revisar
+        // personajes.forEach({personaje => personaje.estadoInicial()}) // revisar
 
-        morcilla.mostrar()
-        game.schedule(200,{jefeFinal.ocultar()})
+        // morcilla.mostrar()
+        // game.schedule(200,{jefeFinal.ocultar()})
     }
 }
 

diff --git a/interfaz.wlk b/interfaz.wlk
@@ -64,11 +64,11 @@ object fondo inherits Visual(position = game.origin(), image = "vacio.png"){
     }
 }
 
-const cinematicaDerrota = new Cinematica (id = "derrota", duracionFrame = 300, frames = ["frameEjemplo0.jpg", "frameEjemplo1.jpg", "frameEjemplo2.jpg"])
-const cinematicaAtaque = new Cinematica (id = "ataque", duracionFrame = 300, frames = ["frameEjemplo0.jpg", "frameEjemplo1.jpg", "frameEjemplo2.jpg"])
-const cinematicaJefePerro = new Cinematica (id = "gato", duracionFrame = 300, frames = ["frameEjemplo0.jpg", "frameEjemplo1.jpg", "frameEjemplo2.jpg"])
-const cinematicaJefeGato = new Cinematica (id = "perro", duracionFrame = 300, frames = ["frameEjemplo0.jpg", "frameEjemplo1.jpg", "frameEjemplo2.jpg"])
-const cinematicaJefeFinal = new Cinematica (id = "final", duracionFrame = 300, frames = ["frameEjemplo0.jpg", "frameEjemplo1.jpg", "frameEjemplo2.jpg"])
+const cinematicaDerrota = new Cinematica (id = "derrota", duracionFrame = 800, frames = ["MUERTE1.jpg", "MUERTE1.jpg", "MUERTE2.jpg", "MUERTE3.jpg", "MUERTE4.jpg", "MUERTE5.jpg"])
+const cinematicaAtaque = new Cinematica (id = "ataque", duracionFrame = 800, frames = ["GOLPE1.jpg", "GOLPE2.jpg", "GOLPE3.jpg", "GOLPE4.jpg", "GOLPE5.jpg", "GOLPE6.jpg"])
+const cinematicaJefePerro = new Cinematica (id = "perro", duracionFrame = 3000, frames = ["PERRO1.jpg", "PERRO2.jpg", "PERRO3.jpg", "PERRO4.jpg"])
+const cinematicaJefeGato = new Cinematica (id = "gato", duracionFrame = 3000, frames = ["GATO1.jpg", "GATO2.jpg", "GATO3.jpg", "GATO4.JPG"])
+const cinematicaJefeFinal = new Cinematica (id = "final", duracionFrame = 3000, frames = ["frameEjemplo0.jpg", "frameEjemplo1.jpg", "frameEjemplo2.jpg"])
 
 
 // =============================================== SONIDOS ===============================================

diff --git a/main.wpgm b/main.wpgm
@@ -30,7 +30,7 @@ program MorcillaGame {
     keyboard.d().onPressDo({ morcilla.caminar(1) })
 	keyboard.a().onPressDo({ morcilla.caminar(-1) })
 	keyboard.space().onPressDo({ morcilla.saltar(1000) })
-	keyboard.f().onPressDo({ ladridos.play() })
+	keyboard.f().onPressDo({ morcilla.ladrar() })
 
 	morcilla.crearHitbox()
 

diff --git a/morcilla.wlk b/morcilla.wlk
@@ -188,6 +188,10 @@ object morcilla inherits Personaje{
 
         administradorVidas.actualizarVida(vidas)
     }
+
+    method ladrar() {
+        ladridos.play()
+    }
 }
 
 class VidaMorcilla {
@@ -242,4 +246,4 @@ class Hitbox {
 const hitboxMorcilla0 = new Hitbox(desvioX = 0, desvioY = 0) 
 const hitboxMorcilla1 = new Hitbox(desvioX = 0, desvioY = 1) 
 const hitboxMorcilla2 = new Hitbox(desvioX = 1, desvioY = 0) 
-const hitboxMorcilla3 = new Hitbox(desvioX = 1, desvioY = 1) 
+const hitboxMorcilla3 = new Hitbox(desvioX = 1, desvioY = 1)