Skip to content

Commit

Permalink
correccion de bugs, falta balanceo
Browse files Browse the repository at this point in the history
  • Loading branch information
MNVallone committed Nov 30, 2024
1 parent ad67e14 commit f89cec6
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 12 deletions.
25 changes: 15 additions & 10 deletions administradorDeJuego.wlk
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ object derrota {
method sonido() = game.sound("m.deathScreen.mp3")

}

object victoria {
method position() = new MutablePosition(x = 0, y = 0)
method imagen() = "victoria.jpg"
Expand All @@ -99,6 +98,12 @@ object portada {
method imagen() = "portada3.png"
method sonido() = game.sound("m.inicio.mp3")
}
object finDeNivel {
method position() = new MutablePosition(x = 0, y = 0)
method imagen() = "finNivel.png"
method sonido() = game.sound("m.deathScreen.mp3")
}

object pausa{
method position() = new MutablePosition(x = 0, y = 0)
method imagen() = "pantallaPausa.png"
Expand Down Expand Up @@ -380,11 +385,11 @@ object botonMutearMusica{
if (muteada){
configuracion.iniciarMusica()
imagen="botonDesmuteoSeleccionado.png"
muteada=false
muteada = false
}
else {
configuracion.detenerMusica()
imagen="botonMuteoSeleccionado.png"
imagen="botonMuteo.png"
muteada=true
}
}
Expand All @@ -397,7 +402,7 @@ object botonMutearMusica{
}
method ponerMarcoDeSeleccion(){
if(muteada){
imagen="botonMuteo.png"
imagen="botonMuteoSeleccionado.png"
}
else imagen="botonDesmuteoSeleccionado.png"
}
Expand All @@ -414,7 +419,7 @@ object botonMutearMusica{
class BotonDeNivel{
const imagenSinSeleccionar
const imagenDeSeleccion
var property imagen=imagenSinSeleccionar
var property imagen = imagenSinSeleccionar
const numNivel
const property nivel
method image()=imagen
Expand Down Expand Up @@ -445,13 +450,13 @@ class BotonDeNivel{
}
}

const botonNivel1 = new BotonDeNivel(imagenSinSeleccionar="botonNivel1.jpg", imagenDeSeleccion="botonNivel1Seleccionado.jpg",
const botonNivel1 = new BotonDeNivel(imagenSinSeleccionar="botonNivel1.png", imagenDeSeleccion="botonNivel1Seleccionado.png",
posicion= new MutablePosition(x=5,y=4), numNivel=1,nivel=nivel1)
const botonNivel2 = new BotonDeNivel(imagenSinSeleccionar="botonNivel2.jpg", imagenDeSeleccion="botonNive2Seleccionado.jpg",
const botonNivel2 = new BotonDeNivel(imagenSinSeleccionar="botonNivel2.png", imagenDeSeleccion="botonNivel2Seleccionado.png",
posicion= new MutablePosition(x=7,y=4), numNivel=2,nivel=nivel2)
const botonNivel3 = new BotonDeNivel(imagenSinSeleccionar="botonNivel3.jpg", imagenDeSeleccion="botonNivel3Seleccionado.jpg",
const botonNivel3 = new BotonDeNivel(imagenSinSeleccionar="botonNivel3.png", imagenDeSeleccion="botonNivel3Seleccionado.png",
posicion= new MutablePosition(x=9,y=4), numNivel=3,nivel=nivel3)
const botonNivel4 = new BotonDeNivel(imagenSinSeleccionar="botonNivel4.jpg", imagenDeSeleccion="botonNive4Seleccionado.jpg",
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="botonNivelFINAL.jpg", imagenDeSeleccion="botonNivelFINALSeleccionado.jpg",
const botonNivel5 = new BotonDeNivel(imagenSinSeleccionar="botonNivel4.png", imagenDeSeleccion="botonNivel4Seleccionado.png",
posicion= new MutablePosition(x=8,y=2), numNivel=5,nivel=nivelFinal)
8 changes: 7 additions & 1 deletion administradorDeOleadas.wlk
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,17 @@ object administradorDeOleadas {
administradorDeJuego.terminarJuego()
}
else{
pantalla.nuevoEstado(finDeNivel)
game.addVisual(pantalla)
game.schedule(2500, {
game.removeVisual(pantalla)
puntaje.reset()
numeroOleada = 1
administradorDeMagos.reset()
nivelActual = self.nivel()
oleadaInicial.start()}
oleadaInicial.start()
})
}
}
}
// Gestión de contadores de enemigos
Expand Down
Binary file added assets/botonDesmuteo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonEterno.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonEternoSeleccionado.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonHistoria.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonHistoriaSeleccionado.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonMuteoSeleccionado.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonNivel1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonNivel1Seleccionado.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonNivel2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonNivel2Seleccionado.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonNivel3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonNivel3Seleccionado.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonNivel4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/botonNivel4Seleccionado.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/final.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/finalSeleccionado.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion main.wpgm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import menu.*

program juego {

game.title("cursor")
game.title("Magos VS Slimes")
game.height(6)
game.width(15)
game.cellSize(100)
Expand Down
Empty file removed note.txt
Empty file.

0 comments on commit f89cec6

Please sign in to comment.