Skip to content

Commit

Permalink
subo imagenes
Browse files Browse the repository at this point in the history
  • Loading branch information
@MateoGiuffra
MateoGiuffra committed Nov 22, 2023
1 parent 473685a commit b4ea09b
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 29 deletions.
Binary file added assets/fondoFin.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/fondoReglas.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 assets/harryCongelado.png → assets/harryCongeladoConLlave.png
View file
File renamed without changes
Binary file added assets/harryCongeladoConNada.png
View file
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/harryCongeladoConVarita.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/puertaAbierto.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/puertaCerrado.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 assets/siriusCongelado.png → assets/siriusCongeladoConLlave.png
View file
File renamed without changes
Binary file added assets/siriusCongeladoConNada.png
View file
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/siriusCongeladoConVarita.png
View file
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/siriusPerroConLlave.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/enemigos.wlk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class GuardiaPerseguidor inherits Guardia {

override method colisionarCon(personaje) {
game.say(self, "¡TE ATRAPE!")
personaje.volverAlPrincipio()
protagonistas.perder()
self.volverPosicionCustodia()
}

Expand Down Expand Up @@ -386,7 +386,7 @@ class Pua {
}

method colisionarCon(personaje) {
estado.colisionarCon(personaje)
estado.colisionarCon(protagonistas)
}

method esSolidoPara(personaje) {
Expand Down
2 changes: 1 addition & 1 deletion src/juego.wpgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ program juego {
game.width(30)
game.height(18)

nivelM.iniciar()
nivelB.iniciar()

game.onCollideDo(harry, {colisionado => colisionado.colisionarCon(harry)})
game.onCollideDo(sirius, {colisionado => colisionado.colisionarCon(sirius)})
Expand Down
62 changes: 36 additions & 26 deletions src/nivelx.wlk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class NivelDeJuego inherits Nivel{


object menu inherits Nivel{
override method image() = "background2.png"
override method image() = "fondoMenu.png"


override method siguiente(){
Expand Down Expand Up @@ -202,26 +202,35 @@ object nivel1 inherits NivelDeJuego {
game.onTick(500, "caminataGuardias", {guardiasNoPerseguidores.perseguir()})
}

override method configurar(){
keyboard.up().onPressDo({ harry.mover(arriba) })
keyboard.down().onPressDo({ harry.mover(abajo) })
keyboard.left().onPressDo({ harry.mover(izquierda) })
keyboard.right().onPressDo({ harry.mover(derecha) })

keyboard.w().onPressDo({ sirius.mover(arriba) })
keyboard.s().onPressDo({ sirius.mover(abajo) })
keyboard.a().onPressDo({ sirius.mover(izquierda) })
keyboard.d().onPressDo({ sirius.mover(derecha) })

game.onCollideDo(harry, {colisionado => colisionado.colisionarCon(harry)})
game.onCollideDo(sirius, {colisionado => colisionado.colisionarCon(sirius)})
keyboard.space().onPressDo({ sirius.usarObjeto() })
keyboard.enter().onPressDo({ harry.usarObjeto() })

keyboard.o().onPressDo({ harry.abrir() })
keyboard.e().onPressDo({ sirius.abrir() })
keyboard.q().onPressDo({ sirius.soltar() })
}
// override method configurar(){
// keyboard.up().onPressDo({ harry.mover(arriba) })
// keyboard.down().onPressDo({ harry.mover(abajo) })
// keyboard.left().onPressDo({ harry.mover(izquierda) })
// keyboard.right().onPressDo({ harry.mover(derecha) })
//
// keyboard.w().onPressDo({ sirius.mover(arriba) })
// keyboard.s().onPressDo({ sirius.mover(abajo) })
// keyboard.a().onPressDo({ sirius.mover(izquierda) })
// keyboard.d().onPressDo({ sirius.mover(derecha) })
//
// game.onCollideDo(harry, {colisionado => colisionado.colisionarCon(harry)})
// game.onCollideDo(sirius, {colisionado => colisionado.colisionarCon(sirius)})
// keyboard.space().onPressDo({ sirius.usarObjeto() })
// keyboard.enter().onPressDo({ harry.usarObjeto() })
//
//
//
// keyboard.o().onPressDo({ harry.abrir() })
// keyboard.e().onPressDo({ sirius.abrir() })
//
// keyboard.q().onPressDo({ sirius.soltar() })
// keyboard.l().onPressDo({ harry.soltar() })
//
// keyboard.p().onPressDo({ harry.usarHechizo()})
// keyboard.z().onPressDo({ sirius.usarHechizo()})
//
//
// }



Expand Down Expand Up @@ -297,11 +306,11 @@ object nivelB inherits NivelDeJuego{
[_, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, p, _, _],
[_, p, _, _, _, _, _, _, _, _, p, _, _, _, _, _, _, _, _, _, _, gp, _, _, _, _, _, p, _, _],
[_, p, _, _, pu, pu, pu, _, _, _, p, _, _, _, _, _, _, _, _, _, _, _, _, _, gp, _, _, p, _, _],
[_, p, _, _, pu, ps, pu, _, _, _, p, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, p, _, _],
[_, p, _, _, pu, bs, pu, _, _, _, p, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, p, p, p],
[_, p, _, _, pu, ps, pu, _, _, _, p, _, zv, _, _, zv, _, _, _, _, _, _, _, _, _, _, _, p, _, _],
[_, p, _, _, pu, bs, pu, _, _, _, p, _, _, _, _, _, _, zv, _, _, _, _, _, _, _, _, _, p, p, p],
[p, p, _, _, pu, pu, pu, _, _, _, p, p, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, p, p, p],
[_, h, s, _, _, _, _, _, _, _, d1, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, f],
[p, p, _, _, _, _, _, _, _, _, p, _, _, _, _, _, _, _, _, _, _, _, _, _, _, p, p, p, p, p, p, p],
[_, h, s, _, _, _, _, _, _, _, d1, _, zv, _, _, zv, _, _, _, _, _, _, _, p, _, _, _, _, _, f],
[p, p, _, _, _, _, _, _, _, _, p, _, zv, _, _, _, _, _, _, _, zv, _, _, _, _, p, p, p, p, p, p, p],
[_, p, _, _, _, _, _, _, _, _, p, p, _, _, _, _, _, _, _, _, _, _, _, _, p, p, p, p, p, _, _],
[_, p, _, _, _, _, _, _, _, _, p, _, _, _, _, _, pu, pu, pu, pu, pu, pu, pu, p, p, p, p, p, _, _],
[_, p, _, o, _, _, _, _, _, _, p, _, p, _, _, _, pu, _, pu, _, pu, _, pu, d2, _, pu, sb, p, _, _],
Expand All @@ -314,7 +323,7 @@ object nivelB inherits NivelDeJuego{

override method accionDeNivel(){
game.onTick(800, "movimientoPuas", {caminoDePuas.activarMovimiento()})
game.onTick(1000, "caminataGuardias", {guardiasNoPerseguidores.perseguir()})
game.onTick(1000, "caminataGuardias", {guardiasPerseguidores.perseguir()})
}

override method siguiente(){
Expand Down Expand Up @@ -484,6 +493,7 @@ object ao{

object f{
method generar(position){
puertaNivel.position(position)
game.addVisual(puertaNivel)
}
}
Expand Down

0 comments on commit b4ea09b

Please sign in to comment.