diff --git a/administradorDeJuego.wlk b/administradorDeJuego.wlk index 67318bb..5da6687 100644 --- a/administradorDeJuego.wlk +++ b/administradorDeJuego.wlk @@ -90,7 +90,7 @@ object derrota { } object victoria { method position() = new MutablePosition(x = 0, y = 0) - method imagen() = "Victoria2.png" + method imagen() = "victoria.jpg" method sonido() = game.sound("m.deathScreen.mp3") } object portada { @@ -377,7 +377,7 @@ object botonNiveles{ } object botonMutearMusica{ - var imagen="botonMuteo.png" +var imagen="botonMuteo.png" method image()=imagen method position()= new MutablePosition(x=13,y=1) var muteada=true @@ -385,15 +385,14 @@ object botonMutearMusica{ if (muteada){ configuracion.iniciarMusica() imagen="botonDesmuteoSeleccionado.png" - muteada = false + muteada=false } else { configuracion.detenerMusica() - imagen="botonMuteo.png" + imagen="botonMuteoSeleccionado.png" muteada=true } } - method cambiarEstadoDeSeleccion(estado){ if(estado){ self.ponerMarcoDeSeleccion() @@ -414,6 +413,7 @@ object botonMutearMusica{ } + } class BotonDeNivel{ @@ -458,5 +458,5 @@ const botonNivel3 = new BotonDeNivel(imagenSinSeleccionar="botonNivel3.png", ima posicion= new MutablePosition(x=9,y=4), numNivel=3,nivel=nivel3) const botonNivel4 = new BotonDeNivel(imagenSinSeleccionar="botonNivel4.png", imagenDeSeleccion="botonNivel4Seleccionado.png", posicion= new MutablePosition(x=6,y=2), numNivel=4,nivel=nivel4) -const botonNivel5 = new BotonDeNivel(imagenSinSeleccionar="botonFINAL.png", imagenDeSeleccion="botonFINALSeleccionado.png", +const botonNivel5 = new BotonDeNivel(imagenSinSeleccionar="botonNivel4.png", imagenDeSeleccion="botonNivel4Seleccionado.png", posicion= new MutablePosition(x=8,y=2), numNivel=5,nivel=nivelFinal) \ No newline at end of file diff --git a/administradorDeOleadas.wlk b/administradorDeOleadas.wlk index 9cb60f8..36e0f75 100644 --- a/administradorDeOleadas.wlk +++ b/administradorDeOleadas.wlk @@ -54,13 +54,16 @@ object administradorDeOleadas { oleadaInicial.start() } else{ - nivelActual.reset() + numNivel+=1 if(numNivel>niveles.size()){ + numNivel = 1 pantalla.nuevoEstado(victoria) administradorDeJuego.terminarJuego() } else{ + nivelActual.reset() + pantalla.nuevoEstado(finDeNivel) game.addVisual(pantalla) game.schedule(2500, { @@ -128,7 +131,7 @@ class Nivel{ method inicioOleada() = game.sound("m.iOleada.mp3") method finOleada() = game.sound("m.fOleada.mp3") // Verifica si la oleada final está en ejecución - method ejecutando() = cantidadEnemigos > enemigosGenerados && enemigosRestantes > 0 + method ejecutando() = cantidadEnemigos >= enemigosGenerados && enemigosRestantes > 0 method seGeneroEnemigo() {enemigosGenerados+=1} @@ -179,7 +182,10 @@ override method siguienteOleada(){ } self.reset() } - + override method reset() { + super() + cantidadEnemigos = 10 + } } diff --git a/assets/botonInicio.png b/assets/botonInicio.png new file mode 100644 index 0000000..03ee70c Binary files /dev/null and b/assets/botonInicio.png differ diff --git a/assets/botonInicioSeleccionado.png b/assets/botonInicioSeleccionado.png new file mode 100644 index 0000000..4f2b09b Binary files /dev/null and b/assets/botonInicioSeleccionado.png differ diff --git a/assets/botonMuteo.png b/assets/botonMuteo.png index 74a2c70..ac0801e 100644 Binary files a/assets/botonMuteo.png and b/assets/botonMuteo.png differ diff --git a/assets/botonNiveles.png b/assets/botonNiveles.png new file mode 100644 index 0000000..8abfe92 Binary files /dev/null and b/assets/botonNiveles.png differ diff --git a/assets/botonNivelesSeleccionado.png b/assets/botonNivelesSeleccionado.png new file mode 100644 index 0000000..f9c381a Binary files /dev/null and b/assets/botonNivelesSeleccionado.png differ diff --git a/assets/s.slimeAgil.png b/assets/s.slimeAgil.png new file mode 100644 index 0000000..bc31e4c Binary files /dev/null and b/assets/s.slimeAgil.png differ diff --git a/assets/s.slimeBase.png b/assets/s.slimeBase.png new file mode 100644 index 0000000..061e4b0 Binary files /dev/null and b/assets/s.slimeBase.png differ diff --git a/assets/s.slimeBlessed.png b/assets/s.slimeBlessed.png new file mode 100644 index 0000000..6c5f832 Binary files /dev/null and b/assets/s.slimeBlessed.png differ diff --git a/assets/s.slimeDorado.png b/assets/s.slimeDorado.png new file mode 100644 index 0000000..db2a863 Binary files /dev/null and b/assets/s.slimeDorado.png differ diff --git a/assets/s.slimeGuerrero.png b/assets/s.slimeGuerrero.png new file mode 100644 index 0000000..3c3c9e8 Binary files /dev/null and b/assets/s.slimeGuerrero.png differ diff --git a/assets/s.slimeLadron.png b/assets/s.slimeLadron.png new file mode 100644 index 0000000..e1cd6f1 Binary files /dev/null and b/assets/s.slimeLadron.png differ diff --git a/assets/s.slimeMedioOriente.png b/assets/s.slimeMedioOriente.png new file mode 100644 index 0000000..0f28c53 Binary files /dev/null and b/assets/s.slimeMedioOriente.png differ diff --git a/assets/s.slimeNinja.png b/assets/s.slimeNinja.png new file mode 100644 index 0000000..5e02a53 Binary files /dev/null and b/assets/s.slimeNinja.png differ